[MERGED] libosmo-sccp[master]: Revert "SCOC: When sending a CORE/CR, SUA SRC_ADDR == Callin...

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Thu Jun 29 14:13:02 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: Revert "SCOC: When sending a CORE/CR, SUA SRC_ADDR == CallingPartyAddress"
......................................................................


Revert "SCOC: When sending a CORE/CR, SUA SRC_ADDR == CallingPartyAddress"

This reverts commit 5527df78adc08b76df07c4b682263b5bdd6181d4.

I tried some time to figure out what other changes are needed to make this
commit work and fix a confusion, until I noticed:

The commit's *log message* is correct that SRC == calling, but the *patch*
modifies callED addr to be the SRC, which is wrong. So reverting this commit is
indeed the correct way to fix our addresses.

Change-Id: Ic76aacc81f87f8885fe04121aead5c79a761ef07
---
M src/sccp_scoc.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 9502953..628b63b 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -483,7 +483,7 @@
 		xua_msg_add_u32(xua, SUA_IEI_ROUTE_CTX, conn->inst->route_ctx);
 		xua_msg_add_u32(xua, SUA_IEI_PROTO_CLASS, conn->sccp_class);
 		xua_msg_add_u32(xua, SUA_IEI_SRC_REF, conn->conn_id);
-		xua_msg_add_sccp_addr(xua, SUA_IEI_SRC_ADDR, &conn->called_addr);
+		xua_msg_add_sccp_addr(xua, SUA_IEI_DEST_ADDR, &conn->called_addr);
 		xua_msg_add_u32(xua, SUA_IEI_SEQ_CTRL, 0); /* TODO */
 		/* optional: sequence number (class 3 only) */
 		if (conn->calling_addr.presence)

-- 
To view, visit https://gerrit.osmocom.org/3046
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic76aacc81f87f8885fe04121aead5c79a761ef07
Gerrit-PatchSet: 2
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list