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

Change in osmo-sip-connector[master]: Set MNCC_F_GCR field when the gcr is present

by keith

keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/29560 ) Change subject: Set MNCC_F_GCR field when the gcr is present ...................................................................... Set MNCC_F_GCR field when the gcr is present Commit bd66804082bf813a1f925c6af4df28fd664ac1de established that the MNCC field flag MNCC_F_GCR should be set when the GCR is present, but did not set it. Change-Id: Idad3210055a0d25be6220301b965e3d4c7323692 --- M src/mncc.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index f302b3e..02ba2cc 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -936,10 +936,12 @@ /* Encode the Global Call Reference (if present) */ if (call->gcr_present) { msg = msgb_alloc(sizeof(mncc.gcr), "MNCC GCR"); - if (msg == NULL || (rc = osmo_enc_gcr(msg, &call->gcr)) == 0) + if (msg == NULL || (rc = osmo_enc_gcr(msg, &call->gcr)) == 0) { LOGP(DMNCC, LOGL_ERROR, "MNCC leg(%u) failed to encode GCR\n", call->id); - else + } else { memcpy(&mncc.gcr[0], msg->data, rc); + mncc.fields |= MNCC_F_GCR; + } msgb_free(msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Idad3210055a0d25be6220301b965e3d4c7323692 Gerrit-Change-Number: 29560 Gerrit-PatchSet: 2 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Introduce API osmux_xfrm_input_get_deliver_cb_data()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29569 ) Change subject: osmux: Introduce API osmux_xfrm_input_get_deliver_cb_data() ...................................................................... osmux: Introduce API osmux_xfrm_input_get_deliver_cb_data() This API allows retrieving back the private pointer set previously by osmux_xfrm_input_set_deliver_cb(). Change-Id: I95433b18802f73fa70e758f4aa02128eee940d88 --- M include/osmocom/netif/osmux.h M src/osmux_input.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/69/29569/1 diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index e02c5cd..f7a5fd5 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -110,6 +110,7 @@ void osmux_xfrm_input_set_batch_size(struct osmux_in_handle *h, uint16_t batch_size); void osmux_xfrm_input_set_initial_seqnum(struct osmux_in_handle *h, uint8_t osmux_seqnum); void osmux_xfrm_input_set_deliver_cb(struct osmux_in_handle *h, void (*deliver_cb)(struct msgb *msg, void *data), void *data); +void *osmux_xfrm_input_get_deliver_cb_data(struct osmux_in_handle *h); int osmux_xfrm_input_open_circuit(struct osmux_in_handle *h, int ccid, int dummy); void osmux_xfrm_input_close_circuit(struct osmux_in_handle *h, int ccid); diff --git a/src/osmux_input.c b/src/osmux_input.c index f177ea9..2c18b20 100644 --- a/src/osmux_input.c +++ b/src/osmux_input.c @@ -686,6 +686,11 @@ h->data = data; } +void *osmux_xfrm_input_get_deliver_cb_data(struct osmux_in_handle *h) +{ + return h->data; +} + int osmux_xfrm_input_open_circuit(struct osmux_in_handle *h, int ccid, int dummy) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I95433b18802f73fa70e758f4aa02128eee940d88 Gerrit-Change-Number: 29569 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-sip-connector[master]: Set MNCC_F_GCR field when the gcr is present

by fixeria

Attention is currently required from: keith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/29560 ) Change subject: Set MNCC_F_GCR field when the gcr is present ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Idad3210055a0d25be6220301b965e3d4c7323692 Gerrit-Change-Number: 29560 Gerrit-PatchSet: 2 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 03 Oct 2022 15:17:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-sip-connector[master]: mncc: fix MNCC_SETUP_REQ: set MNCC_F_GCR if GCR is present

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/29561 ) Change subject: mncc: fix MNCC_SETUP_REQ: set MNCC_F_GCR if GCR is present ...................................................................... Abandoned https://gerrit.osmocom.org/c/osmo-sip-connector/+/29560 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9dd22caef78e37543dac8a6b31a6ee349e7e5aa8 Gerrit-Change-Number: 29561 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 8 months

1
0
0 0

Change in osmo-sip-connector[master]: mncc: fix MNCC_SETUP_REQ: set MNCC_F_GCR if GCR is present

by fixeria

Attention is currently required from: pespin, keith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/29561 ) Change subject: mncc: fix MNCC_SETUP_REQ: set MNCC_F_GCR if GCR is present ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Yes, I already submitted it. I guess I should have added fiexeria to reviewers. Interesting: Gerrit does not show your patch in "Merge conflicts". -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9dd22caef78e37543dac8a6b31a6ee349e7e5aa8 Gerrit-Change-Number: 29561 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 03 Oct 2022 15:16:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: keith <keith(a)rhizomatica.org> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-sip-connector[master]: mncc: fix MNCC_SETUP_REQ: set MNCC_F_GCR if GCR is present

by keith

Attention is currently required from: pespin, fixeria. keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/29561 ) Change subject: mncc: fix MNCC_SETUP_REQ: set MNCC_F_GCR if GCR is present ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Haven't i seen this patch already somewhere else? Yes, I already submitted it. I guess I should have added fiexeria to reviewers. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9dd22caef78e37543dac8a6b31a6ee349e7e5aa8 Gerrit-Change-Number: 29561 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Oct 2022 15:14:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: mncc: move MNCC_F_ALL from mncc.c to mncc.h

by keith

Attention is currently required from: fixeria, pespin. keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29562 ) Change subject: mncc: move MNCC_F_ALL from mncc.c to mncc.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If1a12a696b87184c9eee14f475594c317927427b Gerrit-Change-Number: 29562 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Oct 2022 15:07:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Unify rtp_conn osmux type into a single type

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29568 ) Change subject: osmux: Unify rtp_conn osmux type into a single type ...................................................................... osmux: Unify rtp_conn osmux type into a single type There's no need to separate between BSS and CN side nowadays, the different types are used nowehere. This separation dates from osmo-bsc-nat code days. Change-Id: I65effeddf033eb1955553e8d659c593b4e67f7bc --- M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_iuup.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c 5 files changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/68/29568/1 diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index d9b38c0..7ac40ab 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -46,8 +46,7 @@ /* Specific rtp connection type (see struct mgcp_conn_rtp) */ enum mgcp_conn_rtp_type { MGCP_RTP_DEFAULT = 0, - MGCP_OSMUX_BSC, - MGCP_OSMUX_BSC_NAT, + MGCP_RTP_OSMUX, MGCP_RTP_IUUP, }; @@ -224,7 +223,7 @@ /* Was conn configured to handle Osmux? */ static inline bool mgcp_conn_rtp_is_osmux(const struct mgcp_conn_rtp *conn) { - return conn->type == MGCP_OSMUX_BSC || conn->type == MGCP_OSMUX_BSC_NAT; + return conn->type == MGCP_RTP_OSMUX; } /* Was conn configured to handle Osmux? */ diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 142b002..48e4ce7 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -342,8 +342,7 @@ return bridge_iuup_to_iuup_peer(conn_rtp_src, conn_rtp_dst, irp); case MGCP_RTP_DEFAULT: return bridge_iuup_to_rtp_peer(conn_rtp_src, conn_rtp_dst, irp); - case MGCP_OSMUX_BSC: - case MGCP_OSMUX_BSC_NAT: + case MGCP_RTP_OSMUX: default: LOGPCONN(conn_rtp_src->conn, DRTP, LOGL_ERROR, "Forward of IuUP payload to RTP connection type %u not supported!\n", diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index a3c245a..5246160 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1013,10 +1013,9 @@ "using mgcp_send() to forward data directly\n"); return mgcp_send(endp, proto == MGCP_PROTO_RTP, mc->from_addr, msg, conn_src, conn_dst); - case MGCP_OSMUX_BSC_NAT: - case MGCP_OSMUX_BSC: + case MGCP_RTP_OSMUX: LOGPENDP(endp, DRTP, LOGL_DEBUG, - "endpoint type is MGCP_OSMUX_BSC_NAT, " + "endpoint type is MGCP_RTP_OSMUX, " "using osmux_xfrm_to_osmux() to forward data through OSMUX\n"); return osmux_xfrm_to_osmux((char*)msgb_data(msg), msgb_length(msg), conn_dst); case MGCP_RTP_IUUP: diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 0e058c9..b548dc5 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -623,7 +623,7 @@ conn->osmux.local_cid = (uint8_t) osmux_cid; conn->osmux.local_cid_allocated = true; - conn->type = MGCP_OSMUX_BSC; + conn->type = MGCP_RTP_OSMUX; return osmux_cid; } diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 711ca31..79fbc53 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -150,8 +150,7 @@ switch (conn->type) { case MGCP_RTP_DEFAULT: - case MGCP_OSMUX_BSC: - case MGCP_OSMUX_BSC_NAT: + case MGCP_RTP_OSMUX: case MGCP_RTP_IUUP: break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I65effeddf033eb1955553e8d659c593b4e67f7bc Gerrit-Change-Number: 29568 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Match remote address in osmux_conn_lookup()

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29565 to look at the new patch set (#2). Change subject: osmux: Match remote address in osmux_conn_lookup() ...................................................................... osmux: Match remote address in osmux_conn_lookup() Change-Id: Ia717efa5f68e9412b86ef44a4c42a0715ff0e469 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/29565/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia717efa5f68e9412b86ef44a4c42a0715ff0e469 Gerrit-Change-Number: 29565 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Fill in from_addr in struct osmo_rtp_msg_ctx

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29567 ) Change subject: osmux: Fill in from_addr in struct osmo_rtp_msg_ctx ...................................................................... osmux: Fill in from_addr in struct osmo_rtp_msg_ctx Change-Id: I9783978e295b964ca914f8d90d73effa8785f10d --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/67/29567/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 652eea7..01a0c2d 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -287,12 +287,12 @@ { struct mgcp_conn_rtp *conn = data; struct mgcp_endpoint *endp = conn->conn->endp; - struct osmo_sockaddr addr = { /* FIXME: do we know the source address?? */ }; + struct osmux_handle *h = conn->osmux.in->data; struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); *mc = (struct osmo_rtp_msg_ctx){ .proto = MGCP_PROTO_RTP, .conn_src = conn, - .from_addr = &addr, + .from_addr = &h->rem_addr, }; endp->type->dispatch_rtp_cb(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I9783978e295b964ca914f8d90d73effa8785f10d Gerrit-Change-Number: 29567 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022