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

Change in osmo-ttcn3-hacks[master]: library: add missing '(value)' specifier to ts_RLCMAC_CTRL_ACK

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29623 ) Change subject: library: add missing '(value)' specifier to ts_RLCMAC_CTRL_ACK ...................................................................... library: add missing '(value)' specifier to ts_RLCMAC_CTRL_ACK Change-Id: Ia3176d0443255cba909ec571cda93875704b08b3 --- M library/RLCMAC_Templates.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/29623/1 diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 3b1e40a..738ee97 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -772,7 +772,8 @@ } /* Template for Uplink Control ACK */ - template RlcmacUlBlock ts_RLCMAC_CTRL_ACK(GprsTlli tlli, CtrlAck ack := MS_RCVD_TWO_RLC_SAME_RTI_DIFF_RBSN) := { + template (value) RlcmacUlBlock + ts_RLCMAC_CTRL_ACK(GprsTlli tlli, CtrlAck ack := MS_RCVD_TWO_RLC_SAME_RTI_DIFF_RBSN) := { ctrl := { mac_hdr := t_RLCMAC_UlMacCtrlH(MAC_PT_RLCMAC_NO_OPT), payload := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3176d0443255cba909ec571cda93875704b08b3 Gerrit-Change-Number: 29623 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: add send template for PACKET_UL_DUMMY_CTRL

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29624 ) Change subject: library: add send template for PACKET_UL_DUMMY_CTRL ...................................................................... library: add send template for PACKET_UL_DUMMY_CTRL Change-Id: I2e1a0a0523d3e6f7ba8a270ff21fbe17a90a61d0 --- M library/RLCMAC_Templates.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/29624/1 diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 738ee97..d4204c7 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -788,6 +788,21 @@ } } + template (value) RlcmacUlBlock + ts_RLCMAC_UL_DUMMY_CTRL(template (value) GprsTlli tlli) := { + ctrl := { + mac_hdr := t_RLCMAC_UlMacCtrlH(MAC_PT_RLCMAC_NO_OPT), + payload := { + msg_type := PACKET_UL_DUMMY_CTRL, + u := { + ul_dummy := { + tlli := tlli + } + } + } + } + } + template LlcBlockHdr t_RLCMAC_LLCBLOCK_HDR(uint16_t length_ind, boolean more, boolean e) := { length_ind := length_ind, more := more, /* 1 = new LLC PDU starts */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2e1a0a0523d3e6f7ba8a270ff21fbe17a90a61d0 Gerrit-Change-Number: 29624 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: cosmetic: fix coding style in f_tx_data_ind_fn()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29625 ) Change subject: pcu: cosmetic: fix coding style in f_tx_data_ind_fn() ...................................................................... pcu: cosmetic: fix coding style in f_tx_data_ind_fn() Change-Id: Ib7ffed5573281b343c7691ff218458a0641ee8b0 --- M pcu/PCUIF_Components.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/29625/1 diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index 030da05..375af8e 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -403,8 +403,8 @@ pcu_msg.u.data_ind.block_nr := fn2macblock(fn); //log(prefix, "DATA.ind"); } else if (has_msg and pcu_msg.u.data_ind.fn < fn) { - setverdict(fail, "We are late scheduling the block! ", pcu_msg.u.data_ind.fn, " < ", fn); - mtc.stop; + setverdict(fail, "We are late scheduling the block! ", pcu_msg.u.data_ind.fn, " < ", fn); + mtc.stop; } else { /* NOPE.ind: */ pcu_msg := valueof(ts_PCUIF_DATA_IND(bts_nr, trx_nr, ts_nr, 0 /* FIXME */, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib7ffed5573281b343c7691ff218458a0641ee8b0 Gerrit-Change-Number: 29625 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: s/tr_RLCMAC_DUMMY_CTRL/tr_RLCMAC_DL_DUMMY_CTRL/

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29622 ) Change subject: library: s/tr_RLCMAC_DUMMY_CTRL/tr_RLCMAC_DL_DUMMY_CTRL/ ...................................................................... library: s/tr_RLCMAC_DUMMY_CTRL/tr_RLCMAC_DL_DUMMY_CTRL/ There also exists UL equivalent of this message, for which I am planning to add a template. Let's clarify direction in the name. Change-Id: I3b19c6679eb432b062e28aee9dd1220dbf33ee31 --- M library/RLCMAC_Templates.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 3 files changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/29622/1 diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index e398491..3b1e40a 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -529,7 +529,7 @@ } } - template RlcmacDlBlock tr_RLCMAC_DUMMY_CTRL(template uint3_t usf := ?, template PageMode page_mode := ?) := { + template RlcmacDlBlock tr_RLCMAC_DL_DUMMY_CTRL(template uint3_t usf := ?, template PageMode page_mode := ?) := { ctrl := { mac_hdr := { payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT), diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index d6749d7..0f16d02 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -549,7 +549,7 @@ var BTS_PDTCH_Block data_msg; [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL())) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL())) -> value data_msg { BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, @@ -579,7 +579,7 @@ var BTS_PDTCH_Block data_msg; [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL())) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL())) -> value data_msg { setverdict(fail, "Unexpected Dummy Ctrl block ", data_msg); f_shutdown(__BFILE__, __LINE__); } @@ -1192,7 +1192,7 @@ var uint32_t dl_fn; f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); - if (not match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (not match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { setverdict(fail, "Failed to match Packet DUMMY DL"); f_shutdown(__BFILE__, __LINE__); } diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 8012daa..611ca23 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -857,7 +857,7 @@ /* we will receive UL ACK/NACK from time to time. In that case, check CdCofing increases */ f_rx_rlcmac_dl_block(dl_block, unused_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { continue; } if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?)) and @@ -927,7 +927,7 @@ while (true) { f_ms_tx_ul_data_block(ms, f_rnd_octstring(10), cv := 15); f_rx_rlcmac_dl_block(dl_block, unused_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { continue; } @@ -1092,7 +1092,7 @@ bsn := i mod bsn_mod; f_rx_rlcmac_dl_block(dl_block, fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL)) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL)) { /* No more data to receive, done */ break; } @@ -1200,7 +1200,7 @@ while (true) { f_ms_tx_ul_data_block(ms, f_rnd_octstring(10), cv := 15); f_rx_rlcmac_dl_block(dl_block, unused_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { continue; } @@ -1636,7 +1636,7 @@ * above case before continuing (expect /* Dummy block): */ BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)); + tr_RLCMAC_DL_DUMMY_CTRL)); } [] BTS.receive { setverdict(fail, "Unexpected BTS message"); @@ -1979,7 +1979,7 @@ */ [N3105 == N3105_MAX] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL)) -> value data_msg { if (not T_3195.running) { T_3195.start; /* We even send some new data, nothing should be sent to MS */ @@ -2256,7 +2256,7 @@ /* we will receive UL ACK/NACK from time to time, handle it. */ f_rx_rlcmac_dl_block(dl_block, dl_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { continue; } if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?)) and @@ -2992,7 +2992,7 @@ alt { [data_received] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)) { /* done */ } + tr_RLCMAC_DL_DUMMY_CTRL)) { /* done */ } [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), tr_RLCMAC_DATA)) -> value data_msg { @@ -3429,7 +3429,7 @@ */ [N3105 == N3105_MAX] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL)) -> value data_msg { if (not T_3195.running) { T_3195.start; } @@ -3455,7 +3455,7 @@ /* We receive Dummy blocks in between Pkt Ul Ass while PCU waits for us to ack it */ [not T_3195.running] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + tr_RLCMAC_DL_DUMMY_CTRL)) -> value data_msg { log("Ignoring Dummy block FN ", data_msg.raw.fn); nr := ts_TsTrxBtsNum; BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, @@ -4632,7 +4632,7 @@ for (var integer i := 0; i < 800; i := i + 1) { f_rx_rlcmac_dl_block(dl_block, dl_fn); - if (match(dl_block, tr_RLCMAC_DUMMY_CTRL)) { + if (match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL)) { /* No more data to receive, done */ break; } @@ -4894,7 +4894,7 @@ var integer i := 0; while (true) { f_rx_rlcmac_dl_block(dl_block, sched_fn); - if (not match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + if (not match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL())) { break; } if (max_num_iter > 0 and i > max_num_iter) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3b19c6679eb432b062e28aee9dd1220dbf33ee31 Gerrit-Change-Number: 29622 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in docker-playground[master]: ttcn3-mgw: Set osmux bind-ip(-v6) VTY configs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29615 ) Change subject: ttcn3-mgw: Set osmux bind-ip(-v6) VTY configs ...................................................................... ttcn3-mgw: Set osmux bind-ip(-v6) VTY configs Until now we forgot to properly configure the osmux socket local ip, but that was fine because 0.0.0.0 was taken as a default. With addition of IPv6, this changed, and the socket is not bound unless an IP address is set (to allow conditional use of IPv4, IPv6 or both). Depends: osmo-mgw.git Change-Id I446cd7da217e9f4a74995d7784ae55dcc60a29b7 Change-Id: Ib7e9428a10238fae395a1707d6034dc5c97b9024 --- M ttcn3-mgw-test/jenkins.sh M ttcn3-mgw-test/osmo-mgw.cfg 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index c0cf2f5..48cd1d1 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -15,6 +15,10 @@ mkdir $VOL_BASE_DIR/mgw cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ +# Can be dropped once released osmo-mgw is >1.10.0: +if image_suffix_is_latest; then + sed -i "/^ osmux bind-ip-v6 fd02:db8:4::180/d" $VOL_BASE_DIR/mgw/osmo-mgw.cfg +fi SUBNET=4 network_create $SUBNET diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index 4770732..36485d8 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -58,6 +58,8 @@ number endpoints 31 allow-transcoding osmux off + osmux bind-ip 172.18.4.180 + osmux bind-ip-v6 fd02:db8:4::180 trunk 1 sdp audio-payload send-ptime sdp audio-payload send-name -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib7e9428a10238fae395a1707d6034dc5c97b9024 Gerrit-Change-Number: 29615 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: Clean up local var pointers in mgcp_get_local_addr()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29621 ) Change subject: Clean up local var pointers in mgcp_get_local_addr() ...................................................................... Clean up local var pointers in mgcp_get_local_addr() Change-Id: I12f1d38b70f97426318e948cd80f9efc2592d54b --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 15 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 41e6ffc..781bb44 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -89,13 +89,12 @@ * IP-Addresses are used as fallback. */ int mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn) { - - struct mgcp_endpoint *endp; + const struct mgcp_endpoint *endp = conn->conn->endp; + const struct mgcp_config *cfg = endp->trunk->cfg; char ipbuf[INET6_ADDRSTRLEN]; int rc; - endp = conn->conn->endp; bool rem_addr_set = osmo_sockaddr_is_any(&conn->end.addr) == 0; - char *bind_addr; + const char *bind_addr; /* Osmux: No smart IP addresses allocation is supported yet. Simply * return the one set in VTY config: */ @@ -103,19 +102,19 @@ if (rem_addr_set) { /* Match IP version with what was requested from remote: */ bind_addr = conn->end.addr.u.sa.sa_family == AF_INET6 ? - conn->conn->endp->trunk->cfg->osmux_addr_v6 : - conn->conn->endp->trunk->cfg->osmux_addr_v4; + cfg->osmux_addr_v6 : + cfg->osmux_addr_v4; } else { /* Choose any of the bind addresses, preferring v6 over v4 if available: */ - bind_addr = conn->conn->endp->trunk->cfg->osmux_addr_v6; + bind_addr = cfg->osmux_addr_v6; if (!bind_addr) - bind_addr = conn->conn->endp->trunk->cfg->osmux_addr_v4; + bind_addr = cfg->osmux_addr_v4; } if (!bind_addr) { LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, "Unable to locate local Osmux address, check your configuration! v4=%u v6=%u remote_known=%s\n", - !!conn->conn->endp->trunk->cfg->osmux_addr_v4, - !!conn->conn->endp->trunk->cfg->osmux_addr_v6, + !!cfg->osmux_addr_v4, + !!cfg->osmux_addr_v6, rem_addr_set ? osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf) : "no"); return -1; } @@ -127,7 +126,7 @@ } /* Try probing the local IP-Address */ - if (endp->trunk->cfg->net_ports.bind_addr_probe && rem_addr_set) { + if (cfg->net_ports.bind_addr_probe && rem_addr_set) { rc = osmo_sock_local_ip(addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); if (rc < 0) LOGPCONN(conn->conn, DRTP, LOGL_ERROR, @@ -145,13 +144,13 @@ /* Check there is a bind IP for the RTP traffic configured, * if so, use that IP-Address */ bind_addr = conn->end.addr.u.sa.sa_family == AF_INET6 ? - endp->trunk->cfg->net_ports.bind_addr_v6 : - endp->trunk->cfg->net_ports.bind_addr_v4; + cfg->net_ports.bind_addr_v6 : + cfg->net_ports.bind_addr_v4; } else { /* Choose any of the bind addresses, preferring v6 over v4 */ - bind_addr = endp->trunk->cfg->net_ports.bind_addr_v6; + bind_addr = cfg->net_ports.bind_addr_v6; if (!strlen(bind_addr)) - bind_addr = endp->trunk->cfg->net_ports.bind_addr_v4; + bind_addr = cfg->net_ports.bind_addr_v4; } if (strlen(bind_addr)) { LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, @@ -161,7 +160,7 @@ /* No specific bind IP is configured for the RTP traffic, so * assume the IP where we listen for incoming MGCP messages * as bind IP */ - bind_addr = endp->trunk->cfg->source_addr; + bind_addr = cfg->source_addr; LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "using mgcp bind ip as local rtp bind ip: %s\n", bind_addr); } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I12f1d38b70f97426318e948cd80f9efc2592d54b Gerrit-Change-Number: 29621 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: Add Osmux IPv6 support

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29614 ) Change subject: Add Osmux IPv6 support ...................................................................... Add Osmux IPv6 support A new osmux bind-ip-v6 VTY command is added, similar to what's already available for RTP. This way the user can decide whether to support IPv4, IPv6 or both types of IP versions. Both IP sockets are by default disabled, and must be explicitly enabled by setting the bind-ip in the VTY configuration. Change-Id: I446cd7da217e9f4a74995d7784ae55dcc60a29b7 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 6 files changed, 99 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 4c541cb..2005e4f 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -160,7 +160,8 @@ /* Osmux usage policy: */ enum osmux_usage osmux_use; /* addr to bind the server to */ - char osmux_addr[INET6_ADDRSTRLEN]; + char *osmux_addr_v4; + char *osmux_addr_v6; /* The BSC-NAT may ask for enabling osmux on demand. This tells us if * the osmux socket is already initialized. */ diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index 349ff94..a3d57f0 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -157,7 +157,7 @@ struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, struct osmo_sockaddr *addr, struct msgb *msg); -void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); +int mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); /* payload processing default functions */ int mgcp_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_rtp_end *dst_end, diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 401bb09..41e6ffc 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -81,12 +81,13 @@ /*! Determine the local rtp bind IP-address. * \param[out] addr caller provided memory to store the resulting IP-Address. * \param[in] endp mgcp endpoint, that holds a copy of the VTY parameters. + * \ returns 0 on success, -1 if no local address could be provided. * * The local bind IP-address is automatically selected by probing the * IP-Address of the interface that is pointing towards the remote IP-Address, * if no remote IP-Address is known yet, the statically configured * IP-Addresses are used as fallback. */ -void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn) +int mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn) { struct mgcp_endpoint *endp; @@ -99,12 +100,30 @@ /* Osmux: No smart IP addresses allocation is supported yet. Simply * return the one set in VTY config: */ if (mgcp_conn_rtp_is_osmux(conn)) { - bind_addr = conn->conn->endp->trunk->cfg->osmux_addr; - LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, - "using configured osmux bind ip as local bind ip %s\n", + if (rem_addr_set) { + /* Match IP version with what was requested from remote: */ + bind_addr = conn->end.addr.u.sa.sa_family == AF_INET6 ? + conn->conn->endp->trunk->cfg->osmux_addr_v6 : + conn->conn->endp->trunk->cfg->osmux_addr_v4; + } else { + /* Choose any of the bind addresses, preferring v6 over v4 if available: */ + bind_addr = conn->conn->endp->trunk->cfg->osmux_addr_v6; + if (!bind_addr) + bind_addr = conn->conn->endp->trunk->cfg->osmux_addr_v4; + } + if (!bind_addr) { + LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, + "Unable to locate local Osmux address, check your configuration! v4=%u v6=%u remote_known=%s\n", + !!conn->conn->endp->trunk->cfg->osmux_addr_v4, + !!conn->conn->endp->trunk->cfg->osmux_addr_v6, + rem_addr_set ? osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf) : "no"); + return -1; + } + LOGPCONN(conn->conn, DOSMUX, LOGL_DEBUG, + "Using configured osmux bind ip as local bind ip %s\n", bind_addr); osmo_strlcpy(addr, bind_addr, INET6_ADDRSTRLEN); - return; + return 0; } /* Try probing the local IP-Address */ @@ -117,7 +136,7 @@ LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "selected local rtp bind ip %s by probing using remote ip %s\n", addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); - return; + return 0; } } @@ -147,6 +166,7 @@ "using mgcp bind ip as local rtp bind ip: %s\n", bind_addr); } osmo_strlcpy(addr, bind_addr, INET6_ADDRSTRLEN); + return 0; } /* This does not need to be a precision timestamp and diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index de0bc38..3be6d78 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -30,7 +30,8 @@ #include <osmocom/mgcp/mgcp_endp.h> #include <osmocom/mgcp/mgcp_trunk.h> -static struct osmo_fd osmux_fd; +static struct osmo_fd osmux_fd_v4; +static struct osmo_fd osmux_fd_v6; static LLIST_HEAD(osmux_handle_list); @@ -76,20 +77,22 @@ { struct osmux_handle *handle = data; socklen_t dest_len; - int rc; - struct mgcp_trunk *trunk = (struct mgcp_trunk *)osmux_fd.data; + int rc, fd; + struct mgcp_trunk *trunk = (struct mgcp_trunk *)osmux_fd_v4.data; struct rate_ctr_group *all_osmux_stats = trunk->ratectr.all_osmux_conn_stats; switch (handle->rem_addr.u.sa.sa_family) { case AF_INET6: dest_len = sizeof(handle->rem_addr.u.sin6); + fd = osmux_fd_v6.fd; break; case AF_INET: default: dest_len = sizeof(handle->rem_addr.u.sin); + fd = osmux_fd_v4.fd; break; } - rc = sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0, + rc = sendto(fd, batch_msg->data, batch_msg->len, 0, (struct sockaddr *)&handle->rem_addr.u.sa, dest_len); if (rc < 0) { char errbuf[129]; @@ -187,11 +190,6 @@ { struct osmux_handle *h; - if (rem_addr->u.sa.sa_family != AF_INET) { - LOGP(DOSMUX, LOGL_DEBUG, "IPv6 not supported in osmux yet!\n"); - return NULL; - } - h = osmux_handle_find_get(rem_addr); if (h != NULL) return h->in; @@ -450,27 +448,46 @@ /* So far we only support running on one trunk: */ OSMO_ASSERT(trunk == mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID)); - osmo_fd_setup(&osmux_fd, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); + osmo_fd_setup(&osmux_fd_v4, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); + osmo_fd_setup(&osmux_fd_v6, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); - ret = mgcp_create_bind(cfg->osmux_addr, &osmux_fd, cfg->osmux_port, - cfg->endp_dscp, cfg->endp_priority); - if (ret < 0) { - LOGP(DOSMUX, LOGL_ERROR, "cannot bind OSMUX socket to %s:%u\n", - cfg->osmux_addr, cfg->osmux_port); - return ret; + if (cfg->osmux_addr_v4) { + ret = mgcp_create_bind(cfg->osmux_addr_v4, &osmux_fd_v4, cfg->osmux_port, + cfg->endp_dscp, cfg->endp_priority); + if (ret < 0) { + LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv4 socket to %s:%u\n", + cfg->osmux_addr_v4, cfg->osmux_port); + return ret; + } + + ret = osmo_fd_register(&osmux_fd_v4); + if (ret < 0) { + LOGP(DOSMUX, LOGL_ERROR, "Cannot register OSMUX IPv4 socket %s\n", + osmo_sock_get_name2(osmux_fd_v4.fd)); + return ret; + } + LOGP(DOSMUX, LOGL_INFO, "OSMUX IPv4 socket listening on %s\n", + osmo_sock_get_name2(osmux_fd_v4.fd)); } + if (cfg->osmux_addr_v6) { + ret = mgcp_create_bind(cfg->osmux_addr_v6, &osmux_fd_v6, cfg->osmux_port, + cfg->endp_dscp, cfg->endp_priority); + if (ret < 0) { + LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv6 socket to %s:%u\n", + cfg->osmux_addr_v6, cfg->osmux_port); + return ret; + } - ret = osmo_fd_register(&osmux_fd); - if (ret < 0) { - LOGP(DOSMUX, LOGL_ERROR, "cannot register OSMUX socket %s\n", - osmo_sock_get_name2(osmux_fd.fd)); - return ret; + ret = osmo_fd_register(&osmux_fd_v6); + if (ret < 0) { + LOGP(DOSMUX, LOGL_ERROR, "Cannot register OSMUX IPv6 socket %s\n", + osmo_sock_get_name2(osmux_fd_v6.fd)); + return ret; + } + LOGP(DOSMUX, LOGL_INFO, "OSMUX IPv6 socket listening on %s\n", + osmo_sock_get_name2(osmux_fd_v6.fd)); } cfg->osmux_initialized = true; - - LOGP(DOSMUX, LOGL_INFO, "OSMUX socket listening on %s\n", - osmo_sock_get_name2(osmux_fd.fd)); - return 0; } @@ -647,7 +664,7 @@ osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), osmo_sockaddr_port(&conn->end.addr.u.sa), conn->osmux.remote_cid); - return mgcp_udp_send(osmux_fd.fd, &conn->end.addr, (char *)osmuxh, buf_len); + return mgcp_udp_send(osmux_fd_v4.fd, &conn->end.addr, (char *)osmuxh, buf_len); } /* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit boundary. */ diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index a257ffe..46e1d6b 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1067,7 +1067,10 @@ /* Find a local address for conn based on policy and initial SDP remote information, then find a free port for it */ - mgcp_get_local_addr(conn->end.local_addr, conn); + if (mgcp_get_local_addr(conn->end.local_addr, conn) < 0) { + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); + goto error2; + } if (allocate_port(endp, conn) != 0) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); goto error2; @@ -1279,7 +1282,10 @@ to update our announced IP addr and re-bind our local end. This can happen for instance if MGW initially provided an IPv4 during CRCX ACK, and now MDCX tells us the remote has an IPv6 address. */ - mgcp_get_local_addr(new_local_addr, conn); + if (mgcp_get_local_addr(new_local_addr, conn) < 0) { + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); + goto error3; + } if (strcmp(new_local_addr, conn->end.local_addr)) { osmo_strlcpy(conn->end.local_addr, new_local_addr, sizeof(conn->end.local_addr)); mgcp_free_rtp_port(&conn->end); @@ -1627,7 +1633,6 @@ cfg->source_port = 2427; osmo_strlcpy(cfg->source_addr, "0.0.0.0", sizeof(cfg->source_addr)); - osmo_strlcpy(cfg->osmux_addr, "0.0.0.0", sizeof(cfg->osmux_addr)); cfg->rtp_processing_cb = &mgcp_rtp_processing_default; cfg->setup_rtp_processing_cb = &mgcp_setup_rtp_processing_default; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 1bf8789..bc2673d 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -142,8 +142,12 @@ break; } if (g_cfg->osmux_use != OSMUX_USAGE_OFF) { - vty_out(vty, " osmux bind-ip %s%s", - g_cfg->osmux_addr, VTY_NEWLINE); + if (g_cfg->osmux_addr_v4) + vty_out(vty, " osmux bind-ip %s%s", + g_cfg->osmux_addr_v4, VTY_NEWLINE); + if (g_cfg->osmux_addr_v6) + vty_out(vty, " osmux bind-ip-v6 %s%s", + g_cfg->osmux_addr_v6, VTY_NEWLINE); vty_out(vty, " osmux batch-factor %d%s", g_cfg->osmux_batch, VTY_NEWLINE); vty_out(vty, " osmux batch-size %u%s", @@ -1584,12 +1588,21 @@ DEFUN(cfg_mgcp_osmux_ip, cfg_mgcp_osmux_ip_cmd, - "osmux bind-ip " VTY_IPV46_CMD, + "osmux bind-ip " VTY_IPV4_CMD, OSMUX_STR IP_STR - "IPv4 Address to bind to\n" + "IPv4 Address to bind to\n") +{ + osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr_v4, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_osmux_ip_v6, + cfg_mgcp_osmux_ip_v6_cmd, + "osmux bind-ip-v6 " VTY_IPV6_CMD, + OSMUX_STR IP_STR "IPv6 Address to bind to\n") { - osmo_strlcpy(g_cfg->osmux_addr, argv[0], sizeof(g_cfg->osmux_addr)); + osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr_v6, argv[0]); return CMD_SUCCESS; } @@ -1718,6 +1731,7 @@ install_element(MGCP_NODE, &cfg_mgcp_no_sdp_payload_send_name_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_ip_cmd); + install_element(MGCP_NODE, &cfg_mgcp_osmux_ip_v6_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_batch_factor_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_batch_size_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_port_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I446cd7da217e9f4a74995d7784ae55dcc60a29b7 Gerrit-Change-Number: 29614 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: Clean up local var pointers in mgcp_get_local_addr()

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29621 ) Change subject: Clean up local var pointers in mgcp_get_local_addr() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I12f1d38b70f97426318e948cd80f9efc2592d54b Gerrit-Change-Number: 29621 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Oct 2022 08:45:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: Add Osmux IPv6 support

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29614 ) Change subject: Add Osmux IPv6 support ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I446cd7da217e9f4a74995d7784ae55dcc60a29b7 Gerrit-Change-Number: 29614 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Oct 2022 08:45:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: Clean up local var pointers in mgcp_get_local_addr()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29621 ) Change subject: Clean up local var pointers in mgcp_get_local_addr() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I12f1d38b70f97426318e948cd80f9efc2592d54b Gerrit-Change-Number: 29621 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Oct 2022 08:41:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022