February 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ci[master]: lint: checkpatch: ignore MISSING_SPACE

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27253 ) Change subject: lint: checkpatch: ignore MISSING_SPACE ...................................................................... lint: checkpatch: ignore MISSING_SPACE Don't require breaking strings at spaces. This is not useful for strings of hex characters, e.g.: { 123, "ffffffffffffffffffffffffffffffffffffffff" "ffffffffffffffffffffffffffffffffffffffff" "ffffffffffffffffffffffffffffffffffffffff" Change-Id: Ib6be7744418530ae3ddbf373e67d1d7f25a60508 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index 93b601b..faf0fca 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -64,6 +64,7 @@ # * LINE_CONTINUATIONS: false positives # * LINE_SPACING: we don't always put a blank line after declarations # * LONG_LINE*: should be 120 chars, but exceptions are done often so don't fail here +# * MISSING_SPACE: warns about breaking strings at space characters, not useful for long strings of hex chars # * PREFER_DEFINED_ATTRIBUTE_MACRO: macros like __packed not defined in libosmocore # * PREFER_FALLTHROUGH: pseudo keyword macro "fallthrough" is not defined in libosmocore # * REPEATED_WORD: false positives in doxygen descriptions (e.g. '\param[in] data Data passed through...') @@ -103,6 +104,7 @@ --ignore LONG_LINE \ --ignore LONG_LINE_COMMENT \ --ignore LONG_LINE_STRING \ + --ignore MISSING_SPACE \ --ignore PREFER_DEFINED_ATTRIBUTE_MACRO \ --ignore PREFER_FALLTHROUGH \ --ignore REPEATED_WORD \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib6be7744418530ae3ddbf373e67d1d7f25a60508 Gerrit-Change-Number: 27253 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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: split sccp_sap_get_peer_addr_out

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27259 ) Change subject: bsc_nat_fsm: split sccp_sap_get_peer_addr_out ...................................................................... bsc_nat_fsm: split sccp_sap_get_peer_addr_out Split this code into an extra function, as it will be used by other message types in sccp_sap_up too (following patches). Related: SYS#5560 Change-Id: I6bc59445d65f812ccd46eb33dd6cca6b34dd0867 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 27 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/59/27259/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index f91845d..8d6ebe8 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -86,6 +86,31 @@ return -1; } +/* Figure out who will receive the message. + * For now this is simplified by assuming there is only one MSC, one BSC. */ +static int sccp_sap_get_peer_addr_out(struct bsc_nat_ss7_inst *src, struct osmo_sccp_addr *peer_addr_in, + struct osmo_sccp_addr *peer_addr_out) +{ + struct bsc_nat_ss7_inst *dest = ss7_inst_dest(src); + struct osmo_ss7_instance *dest_ss7 = osmo_ss7_instance_find(dest->ss7_id); + + OSMO_ASSERT(dest_ss7); + + if (src == g_bsc_nat->ran) { + if (osmo_sccp_addr_by_name_local(peer_addr_out, "msc", dest_ss7) < 0) { + LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find MSC in address book\n"); + return -1; + } + } else { + if (osmo_sccp_addr_by_name_local(peer_addr_out, "bsc", dest_ss7) < 0) { + LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find BSC in address book\n"); + return -2; + } + } + + return 0; +} + static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu) { struct bsc_nat_ss7_inst *src = osmo_sccp_user_get_priv(scu); @@ -120,26 +145,8 @@ if (sccp_sap_verify_called_addr(src, &prim->u.unitdata.called_addr, peer_addr_in) < 0) goto error; - /* Figure out called party in dest. TODO: build and use a - * mapping of peer_addr + conn_id <--> dest_ss7. For now, this - * is simplified by assuming there is only one MSC, one BSC. */ - - struct osmo_ss7_instance *dest_ss7; - - dest_ss7 = osmo_ss7_instance_find(dest->ss7_id); - OSMO_ASSERT(dest_ss7); - - if (src == g_bsc_nat->ran) { - if (osmo_sccp_addr_by_name_local(&peer_addr_out, "msc", dest_ss7) < 0) { - LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find MSC in address book\n"); - goto error; - } - } else { - if (osmo_sccp_addr_by_name_local(&peer_addr_out, "bsc", dest_ss7) < 0) { - LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find BSC in address book\n"); - goto error; - } - } + if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) + goto error; LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", osmo_sccp_inst_addr_name(NULL, &peer_addr_out), -- 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 ) Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... bsc_nat_fsm: initial conn-oriented forwarding Implement a simple version of forwarding Connection Request, Connection Confirm, Data Form, Released SCCP messages. This is still assuming that there is just one BSC, one MSC, the same connection ID is used in RAN and CN. Future patches will add a mapping between RAN and CN sides and allow multiple BSCs. With this patch it is possible to perform a call between two MS in the following network structure: MS1 --. BTS --- BSC --- BSCNAT --- MSC MS2 --' Related: SYS#5560 Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 87 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/60/27260/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 8d6ebe8..b03edc5 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -86,6 +86,31 @@ return -1; } +/* For connection-oriented messages, figure out which side is the BSCNAT, + * either the called_addr or calling_addr. */ +static int sccp_sap_get_peer_addr_in(struct bsc_nat_ss7_inst *src, struct osmo_sccp_addr **peer_addr, + struct osmo_sccp_addr *called_addr, struct osmo_sccp_addr *calling_addr) +{ + if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, called_addr) == 0) { + *peer_addr = called_addr; + return 0; + } else if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, calling_addr) == 0) { + *peer_addr = calling_addr; + return 1; + } + + char buf_called[255]; + char buf_calling[255]; + + osmo_sccp_addr_to_str_buf(buf_called, sizeof(buf_called), NULL, called_addr); + osmo_sccp_addr_to_str_buf(buf_calling, sizeof(buf_calling), NULL, calling_addr); + + LOG_SCCP(src, NULL, LOGL_ERROR, "Invalid connection oriented message, locally configured address %s" + " is neither called address %s nor calling address %s!\n", + osmo_sccp_inst_addr_name(NULL, &src->local_sccp_addr), buf_called, buf_calling); + return -1; +} + /* Figure out who will receive the message. * For now this is simplified by assuming there is only one MSC, one BSC. */ static int sccp_sap_get_peer_addr_out(struct bsc_nat_ss7_inst *src, struct osmo_sccp_addr *peer_addr_in, @@ -111,6 +136,8 @@ return 0; } +/* Handle incoming messages. For now this is simplified by assuming there is + * only one MSC, one BSC (not yet translating connection ids etc.). */ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu) { struct bsc_nat_ss7_inst *src = osmo_sccp_user_get_priv(scu); @@ -121,20 +148,78 @@ int rc = -1; switch (OSMO_PRIM_HDR(oph)) { + case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): + /* indication of connection confirm */ + LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, + &prim->u.connect.calling_addr) < 0) + goto error; + + if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) + goto error; + + LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_conn_resp(dest->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, + msgb_length(oph->msg)); + rc = 0; + break; + case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ - peer_addr_in = &prim->u.connect.calling_addr; - LOG_SCCP(src, peer_addr_in, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, + &prim->u.connect.calling_addr) < 0) + goto error; + + if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) + goto error; + + LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_conn_req(dest->scu, prim->u.connect.conn_id, &dest->local_sccp_addr, &peer_addr_out, + oph->msg->data, msgb_length(oph->msg)); + rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) + goto error; + + LOG_SCCP(src, NULL, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_data(dest->scu, prim->u.data.conn_id, oph->msg->data, msgb_length(oph->msg)); + rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): /* indication of disconnect */ LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) + goto error; + + LOG_SCCP(src, NULL, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + osmo_sccp_tx_disconn(dest->scu, prim->u.disconnect.conn_id, &prim->u.disconnect.responding_addr, + prim->u.disconnect.cause); + rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 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: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/56/27256/1 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-MessageType: newchange

3 years, 4 months

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27257 ) Change subject: bsc_nat_fsm: split sccp_sap_verify_called_addr out ...................................................................... bsc_nat_fsm: split sccp_sap_verify_called_addr out Make sccp_sap_up a bit shorter before extending it to forward not only connection-less messages, but also connection-oriented messages. While at it, change my_addr to called_addr. my_addr is ambiguous, the bsc-nat has one in CN and one in RAN. Related: SYS#5560 Change-Id: Id9bfbf38a61ef66a4246f752ef487d8a09fea173 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/57/27257/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index e5767b1..b3d061e 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -69,14 +69,29 @@ return g_bsc_nat->cn; } +/* For connection-less messages, verify that the called address is the locally + * configured address. */ +static int sccp_sap_verify_called_addr(struct bsc_nat_ss7_inst *src, struct osmo_sccp_addr *called_addr, + struct osmo_sccp_addr *peer_addr) +{ + char buf[255]; + + if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, called_addr) == 0) + return 0; + + osmo_sccp_addr_to_str_buf(buf, sizeof(buf), NULL, called_addr); + LOG_SCCP(src, peer_addr, LOGL_ERROR, "Called address %s is not the locally configured" + " address %s\n", buf, osmo_sccp_inst_addr_name(NULL, &src->local_sccp_addr)); + + return -1; +} + static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu) { struct bsc_nat_ss7_inst *src = osmo_sccp_user_get_priv(scu); struct bsc_nat_ss7_inst *dest = ss7_inst_dest(src); struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; - struct osmo_sccp_addr *my_addr; struct osmo_sccp_addr *peer_addr; - char buf[255]; int rc = -1; switch (OSMO_PRIM_HDR(oph)) { @@ -98,16 +113,11 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ - my_addr = &prim->u.unitdata.called_addr; peer_addr = &prim->u.unitdata.calling_addr; LOG_SCCP(src, peer_addr, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); - if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, my_addr)) { - osmo_sccp_addr_to_str_buf(buf, sizeof(buf), NULL, my_addr); - LOG_SCCP(src, peer_addr, LOGL_ERROR, "Called address %s is not the locally configured" - " address %s\n", buf, osmo_sccp_inst_addr_name(NULL, &src->local_sccp_addr)); + if (sccp_sap_verify_called_addr(src, &prim->u.unitdata.called_addr, peer_addr) < 0) goto error; - } /* Figure out called party in dest. TODO: build and use a * mapping of peer_addr + conn_id <--> dest_ss7. For now, this -- 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-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 osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27258 ) 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, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/58/27258/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index b3d061e..f91845d 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -39,12 +39,12 @@ static char log_buf[255]; -#define LOG_SCCP(ss7_inst, peer_addr, level, fmt, args...) do { \ - if (peer_addr) \ - osmo_sccp_addr_to_str_buf(log_buf, sizeof(log_buf), NULL, peer_addr); \ +#define LOG_SCCP(ss7_inst, peer_addr_in, level, fmt, args...) do { \ + if (peer_addr_in) \ + osmo_sccp_addr_to_str_buf(log_buf, sizeof(log_buf), NULL, peer_addr_in); \ LOGP(DMAIN, level, "(%s%s%s) " fmt, \ - peer_addr ? log_buf : "", \ - peer_addr ? " from " : "", \ + peer_addr_in ? log_buf : "", \ + peer_addr_in ? " from " : "", \ ss7_inst == g_bsc_nat->ran ? "RAN" : "CN", \ ## args); \ } while (0) @@ -72,7 +72,7 @@ /* For connection-less messages, verify that the called address is the locally * configured address. */ static int sccp_sap_verify_called_addr(struct bsc_nat_ss7_inst *src, struct osmo_sccp_addr *called_addr, - struct osmo_sccp_addr *peer_addr) + struct osmo_sccp_addr *peer_addr_in) { char buf[255]; @@ -80,7 +80,7 @@ return 0; osmo_sccp_addr_to_str_buf(buf, sizeof(buf), NULL, called_addr); - LOG_SCCP(src, peer_addr, LOGL_ERROR, "Called address %s is not the locally configured" + LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Called address %s is not the locally configured" " address %s\n", buf, osmo_sccp_inst_addr_name(NULL, &src->local_sccp_addr)); return -1; @@ -91,14 +91,15 @@ struct bsc_nat_ss7_inst *src = osmo_sccp_user_get_priv(scu); struct bsc_nat_ss7_inst *dest = ss7_inst_dest(src); struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; - struct osmo_sccp_addr *peer_addr; + struct osmo_sccp_addr *peer_addr_in; + struct osmo_sccp_addr peer_addr_out; int rc = -1; switch (OSMO_PRIM_HDR(oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ - peer_addr = &prim->u.connect.calling_addr; - LOG_SCCP(src, peer_addr, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + peer_addr_in = &prim->u.connect.calling_addr; + LOG_SCCP(src, peer_addr_in, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): @@ -113,10 +114,10 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ - peer_addr = &prim->u.unitdata.calling_addr; - LOG_SCCP(src, peer_addr, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + peer_addr_in = &prim->u.unitdata.calling_addr; + LOG_SCCP(src, peer_addr_in, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); - if (sccp_sap_verify_called_addr(src, &prim->u.unitdata.called_addr, peer_addr) < 0) + if (sccp_sap_verify_called_addr(src, &prim->u.unitdata.called_addr, peer_addr_in) < 0) goto error; /* Figure out called party in dest. TODO: build and use a @@ -124,31 +125,30 @@ * is simplified by assuming there is only one MSC, one BSC. */ struct osmo_ss7_instance *dest_ss7; - struct osmo_sccp_addr dest_called; dest_ss7 = osmo_ss7_instance_find(dest->ss7_id); OSMO_ASSERT(dest_ss7); if (src == g_bsc_nat->ran) { - if (osmo_sccp_addr_by_name_local(&dest_called, "msc", dest_ss7) < 0) { - LOG_SCCP(src, peer_addr, LOGL_ERROR, "Could not find MSC in address book\n"); + if (osmo_sccp_addr_by_name_local(&peer_addr_out, "msc", dest_ss7) < 0) { + LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find MSC in address book\n"); goto error; } } else { - if (osmo_sccp_addr_by_name_local(&dest_called, "bsc", dest_ss7) < 0) { - LOG_SCCP(src, peer_addr, LOGL_ERROR, "Could not find BSC in address book\n"); + if (osmo_sccp_addr_by_name_local(&peer_addr_out, "bsc", dest_ss7) < 0) { + LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find BSC in address book\n"); goto error; } } - LOG_SCCP(src, peer_addr, LOGL_NOTICE, "Forwarding to %s in %s\n", - osmo_sccp_inst_addr_name(NULL, &dest_called), + LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), dest == g_bsc_nat->ran ? "RAN" : "CN"); /* oph->msg stores oph and unitdata msg. Move oph->msg->data to * unitdata msg and send it again. */ msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_unitdata(dest->scu, &dest->local_sccp_addr, &dest_called, oph->msg->data, + osmo_sccp_tx_unitdata(dest->scu, &dest->local_sccp_addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); rc = 0; break; -- 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/55/27255/1 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-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: lint: checkpatch: ignore MISSING_SPACE

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27253 ) Change subject: lint: checkpatch: ignore MISSING_SPACE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib6be7744418530ae3ddbf373e67d1d7f25a60508 Gerrit-Change-Number: 27253 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Feb 2022 13:28:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: allow to terminate value_string[] with '{0}'

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27254 ) Change subject: allow to terminate value_string[] with '{0}' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id2f5ba897ec83f34f8d3c4425353c0baf309bb6d Gerrit-Change-Number: 27254 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Feb 2022 13:28:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: allow to terminate value_string[] with '{0}'

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27254 ) Change subject: allow to terminate value_string[] with '{0}' ...................................................................... allow to terminate value_string[] with '{0}' For a long time I was using '{}' to indicate a nulled out struct. But apparently '{0}' is the favored way to write that. Let's allow using this notation to terminate a value_string[]. Change-Id: Id2f5ba897ec83f34f8d3c4425353c0baf309bb6d --- M scripts/verify_value_string_arrays_are_terminated.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/54/27254/1 diff --git a/scripts/verify_value_string_arrays_are_terminated.py b/scripts/verify_value_string_arrays_are_terminated.py index f6dc545..abeff4d 100755 --- a/scripts/verify_value_string_arrays_are_terminated.py +++ b/scripts/verify_value_string_arrays_are_terminated.py @@ -19,7 +19,7 @@ re.MULTILINE | re.DOTALL) members = r'(\.(value|str)\s*=\s*)?' -terminator_re = re.compile('{}|{\s*' + members + '(0|NULL)\s*,' +terminator_re = re.compile('{\s*}|{\s*0\s*}|{\s*' + members + '(0|NULL)\s*,' '\s*' + members + '(0|NULL)\s*}') errors_found = 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id2f5ba897ec83f34f8d3c4425353c0baf309bb6d Gerrit-Change-Number: 27254 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022