- gerrit-log - lists.osmocom.org

Change in libosmocore[master]: add osmo_sockaddr_set_port()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27263 ) Change subject: add osmo_sockaddr_set_port() ...................................................................... add osmo_sockaddr_set_port() Do it like osmo_sockaddr_port() in reverse. Related: SYS#5599 Change-Id: I9512e44c3203daebb3fe3435fceef167613c1a73 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/27263/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index fffc25c..183220d 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -96,6 +96,7 @@ const char *osmo_sockaddr_ntop(const struct sockaddr *sa, char *dst); uint16_t osmo_sockaddr_port(const struct sockaddr *sa); +void osmo_sockaddr_set_port(struct sockaddr *sa, uint16_t port); int osmo_sock_unix_init(uint16_t type, uint8_t proto, const char *socket_path, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 80cba17..4605db4 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1254,6 +1254,23 @@ return 0; } +/*! Set sockaddr port content (to network byte order). + * \param[out] sa sockaddr to set the port of. + * \param[in] port port nr to set. + */ +void osmo_sockaddr_set_port(struct sockaddr *sa, uint16_t port) +{ + struct osmo_sockaddr *osa = (struct osmo_sockaddr *)sa; + switch (osa->u.sa.sa_family) { + case AF_INET6: + osa->u.sin6.sin6_port = htons(port); + return; + case AF_INET: + osa->u.sin.sin_port = htons(port); + return; + } +} + /*! Initialize a unix domain socket (including bind/connect) * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9512e44c3203daebb3fe3435fceef167613c1a73 Gerrit-Change-Number: 27263 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: rename vars to peer_addr_{in,out}

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27258 ) Change subject: bsc_nat_fsm: rename vars to peer_addr_{in,out} ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ib58a4e8eb8beca23cb9f11c46576f8b17bb66f3c Gerrit-Change-Number: 27258 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Feb 2022 18:28:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: split sccp_sap_get_peer_addr_out

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27259 ) Change subject: bsc_nat_fsm: split sccp_sap_get_peer_addr_out ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I6bc59445d65f812ccd46eb33dd6cca6b34dd0867 Gerrit-Change-Number: 27259 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Feb 2022 18:27:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: split sccp_sap_get_peer_addr_out

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27259 ) Change subject: bsc_nat_fsm: split sccp_sap_get_peer_addr_out ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I6bc59445d65f812ccd46eb33dd6cca6b34dd0867 Gerrit-Change-Number: 27259 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Feb 2022 18:25:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: sccp_sap_up: err if not implemented

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27256 ) Change subject: bsc_nat_fsm: sccp_sap_up: err if not implemented ...................................................................... bsc_nat_fsm: sccp_sap_up: err if not implemented Make it more obvious if a message is ignored, because it is not implemented. Related: SYS#5560 Change-Id: Ibc71e6aaed4fd51d090ab31fc3e49f3a82111506 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index b24581a..e5767b1 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -144,7 +144,7 @@ break; default: - LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + LOG_SCCP(src, NULL, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, osmo_scu_prim_name(oph)); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ibc71e6aaed4fd51d090ab31fc3e49f3a82111506 Gerrit-Change-Number: 27256 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: fix SSN of OsmoBSCNAT-CN

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27255 ) Change subject: bsc_nat_fsm: fix SSN of OsmoBSCNAT-CN ...................................................................... bsc_nat_fsm: fix SSN of OsmoBSCNAT-CN Related: SYS#5560 Change-Id: Ic0e64e002bccf1115cc53566bdab9d84dc680b03 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 403097a..b24581a 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -199,7 +199,7 @@ { struct bsc_nat *bsc_nat = (struct bsc_nat *)fi->priv; - if (ss7_inst_init(bsc_nat->cn, "OsmoBSCNAT-CN", DEFAULT_PC_CN, OSMO_SCCP_SSN_RANAP) < 0) { + if (ss7_inst_init(bsc_nat->cn, "OsmoBSCNAT-CN", DEFAULT_PC_CN, OSMO_SCCP_SSN_BSSAP) < 0) { osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STOPPED, 0, 0); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ic0e64e002bccf1115cc53566bdab9d84dc680b03 Gerrit-Change-Number: 27255 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: fix SSN of OsmoBSCNAT-CN

by osmith

Attention is currently required from: neels, fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27255 ) Change subject: bsc_nat_fsm: fix SSN of OsmoBSCNAT-CN ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc-nat/bsc_nat_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27255/comment/433a3362_e8fdaf16 PS1, Line 202: if (ss7_inst_init(bsc_nat->cn, "OsmoBSCNAT-CN", DEFAULT_PC_CN, OSMO_SCCP_SSN_BSSAP) < 0) { > So, both FSMs now use OSMO_SCCP_SSN_BSSAP. Is it expected? […] Yes, this is expected. I've compared traces with BSC -- MSC and BSC --- BSCNAT --- MSC to find the correct SSNs. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ic0e64e002bccf1115cc53566bdab9d84dc680b03 Gerrit-Change-Number: 27255 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Feb 2022 17:36:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: drop called addr verify

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27257 ) Change subject: bsc_nat_fsm: drop called addr verify ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc-nat/bsc_nat_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27257/comment/2c7f03e5_3cf25e7c PS1, Line 74: static int sccp_sap_verify_called_addr(struct bsc_nat_ss7_inst *src, struct osmo_sccp_addr *called_addr, > I'm really not sure this belongs at application level. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Id9bfbf38a61ef66a4246f752ef487d8a09fea173 Gerrit-Change-Number: 27257 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 18 Feb 2022 17:35:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: drop called addr verify

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27257 to look at the new patch set (#2). Change subject: bsc_nat_fsm: drop called addr verify ...................................................................... bsc_nat_fsm: drop called addr verify This is already done by the SCCP stack, as Harald explained it: "Think of a TCP socket where you have already bound a socket and then still do recvmsg to check if the destination address is what you expect." Related: SYS#5560 Change-Id: Id9bfbf38a61ef66a4246f752ef487d8a09fea173 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/57/27257/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Id9bfbf38a61ef66a4246f752ef487d8a09fea173 Gerrit-Change-Number: 27257 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: rename vars to peer_addr_{in,out}

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27258 to look at the new patch set (#2). Change subject: bsc_nat_fsm: rename vars to peer_addr_{in,out} ...................................................................... bsc_nat_fsm: rename vars to peer_addr_{in,out} Only in connection-less messages, the called party address is always the address of the receiving peer. Prepare for connection-oriented messages by renaming: dest_called -> peer_addr_out peer_addr -> peer_addr_in Related: SYS#5560 Change-Id: Ib58a4e8eb8beca23cb9f11c46576f8b17bb66f3c --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/58/27258/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ib58a4e8eb8beca23cb9f11c46576f8b17bb66f3c Gerrit-Change-Number: 27258 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log