- gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: Split cbc_peer to its own .c and .h files
by pespin 20 Jul '22

20 Jul '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28692 ) Change subject: Split cbc_peer to its own .c and .h files ...................................................................... Split cbc_peer to its own .c and .h files Change-Id: I41c890d81e76ac1a1c89d42af70a1f0631e9724e --- M include/osmocom/cbc/Makefile.am M include/osmocom/cbc/cbc_data.h A include/osmocom/cbc/cbc_peer.h M include/osmocom/cbc/cbsp_server.h M include/osmocom/cbc/sbcap_server.h M src/Makefile.am M src/cbc_data.c A src/cbc_peer.c M src/cbc_vty.c M src/cbsp_server.c M src/cbsp_server_fsm.c M src/message_handling.c M src/sbcap_server.c M src/sbcap_server_fsm.c M src/smscb_peer_fsm.c 15 files changed, 174 insertions(+), 122 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/92/28692/1 diff --git a/include/osmocom/cbc/Makefile.am b/include/osmocom/cbc/Makefile.am index d1cc46e..1ceb6a4 100644 --- a/include/osmocom/cbc/Makefile.am +++ b/include/osmocom/cbc/Makefile.am @@ -1,5 +1,6 @@ noinst_HEADERS = \ cbc_data.h \ + cbc_peer.h \ cbsp_server.h \ charset.h \ internal.h \ diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index a90ff66..09b0ebf 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -7,40 +7,9 @@ #include <osmocom/gsm/protocol/gsm_48_049.h> #include <osmocom/gsm/gsm23003.h> -struct osmo_cbsp_cbc_client; -struct osmo_sabp_cbc_client; struct rest_it_op; -#define CBC_MAX_ADDRS 8 - -/********************************************************************************* - * CBC Peer - *********************************************************************************/ - -enum cbc_peer_protocol { - CBC_PEER_PROTO_CBSP, - CBC_PEER_PROTO_SABP, - CBC_PEER_PROTO_SBcAP -}; - -struct cbc_peer { - struct llist_head list; /* linked to cbc.peers */ - const char *name; - - char *remote_host[CBC_MAX_ADDRS]; /* remote IP address in string format */ - unsigned int num_remote_host; /* number of addresses present in remote_host */ - int remote_port; /* remote port number or -1 for random */ - bool unknown_dynamic_peer; /* dynamic/unknown peer; not saved in VTY */ - - enum cbc_peer_protocol proto; - union { - struct osmo_cbsp_cbc_client *cbsp; - struct osmo_sabp_cbc_client *sabp; - struct osmo_sbcap_cbc_client *sbcap; - } client; -}; - -extern const struct value_string cbc_peer_proto_name[]; +#define CBC_MAX_LOC_ADDRS 8 enum cbc_cell_id_type { CBC_CELL_ID_NONE, @@ -176,7 +145,7 @@ int local_port; } cbsp; struct { - char *local_host[CBC_MAX_ADDRS]; + char *local_host[CBC_MAX_LOC_ADDRS]; unsigned int num_local_host; int local_port; } sbcap; @@ -202,8 +171,3 @@ int cbc_message_add_peer(struct cbc_message *cbcmsg, struct cbc_peer *peer); struct cbc_message_peer *smscb_peer_fsm_alloc(struct cbc_peer *peer, struct cbc_message *cbcmsg); struct cbc_message_peer *cbc_message_peer_get(struct cbc_message *cbcmsg, struct cbc_peer *peer); -struct cbc_peer *cbc_peer_by_name(const char *name); -struct cbc_peer *cbc_peer_by_addr_proto(const char *remote_host, uint16_t remote_port, - enum cbc_peer_protocol proto); -struct cbc_peer *cbc_peer_create(const char *name, enum cbc_peer_protocol proto); -void cbc_peer_remove(struct cbc_peer *peer); diff --git a/include/osmocom/cbc/cbc_peer.h b/include/osmocom/cbc/cbc_peer.h new file mode 100644 index 0000000..adfa32d --- /dev/null +++ b/include/osmocom/cbc/cbc_peer.h @@ -0,0 +1,46 @@ +#pragma once +#include <stdint.h> +#include <stdbool.h> +#include <osmocom/core/linuxlist.h> + +struct osmo_cbsp_cbc_client; +struct osmo_sabp_cbc_client; +struct osmo_sbcap_cbc_client; + +#define CBC_MAX_REM_ADDRS 8 + +/********************************************************************************* + * CBC Peer + *********************************************************************************/ + +enum cbc_peer_protocol { + CBC_PEER_PROTO_CBSP, + CBC_PEER_PROTO_SABP, + CBC_PEER_PROTO_SBcAP +}; + +struct cbc_peer { + struct llist_head list; /* linked to cbc.peers */ + const char *name; + + char *remote_host[CBC_MAX_REM_ADDRS]; /* remote IP address in string format */ + unsigned int num_remote_host; /* number of addresses present in remote_host */ + int remote_port; /* remote port number or -1 for random */ + bool unknown_dynamic_peer; /* dynamic/unknown peer; not saved in VTY */ + + enum cbc_peer_protocol proto; + union { + struct osmo_cbsp_cbc_client *cbsp; + struct osmo_sabp_cbc_client *sabp; + struct osmo_sbcap_cbc_client *sbcap; + } client; +}; + +extern const struct value_string cbc_peer_proto_name[]; + +struct cbc_peer *cbc_peer_create(const char *name, enum cbc_peer_protocol proto); +void cbc_peer_remove(struct cbc_peer *peer); + +struct cbc_peer *cbc_peer_by_name(const char *name); +struct cbc_peer *cbc_peer_by_addr_proto(const char *remote_host, uint16_t remote_port, + enum cbc_peer_protocol proto); diff --git a/include/osmocom/cbc/cbsp_server.h b/include/osmocom/cbc/cbsp_server.h index 1576864..e3caf0c 100644 --- a/include/osmocom/cbc/cbsp_server.h +++ b/include/osmocom/cbc/cbsp_server.h @@ -10,6 +10,7 @@ struct osmo_cbsp_cbc_client; struct osmo_fsm_inst; +struct cbc_peer; /* a CBC server */ struct osmo_cbsp_cbc { diff --git a/include/osmocom/cbc/sbcap_server.h b/include/osmocom/cbc/sbcap_server.h index 7b4b7e1..ebc9f2a 100644 --- a/include/osmocom/cbc/sbcap_server.h +++ b/include/osmocom/cbc/sbcap_server.h @@ -13,6 +13,7 @@ struct osmo_sbcap_cbc_client; struct osmo_fsm_inst; +struct cbc_peer; /* a CBC server */ struct osmo_sbcap_cbc { diff --git a/src/Makefile.am b/src/Makefile.am index 5805fd7..f7c9516 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,6 +12,7 @@ osmo_cbc_SOURCES = \ cbc_main.c \ cbc_data.c \ + cbc_peer.c \ cbc_vty.c \ cbsp_server.c \ cbsp_server_fsm.c \ diff --git a/src/cbc_data.c b/src/cbc_data.c index 92da369..4226cfc 100644 --- a/src/cbc_data.c +++ b/src/cbc_data.c @@ -31,13 +31,6 @@ #include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/cbsp_server.h> -const struct value_string cbc_peer_proto_name[] = { - { CBC_PEER_PROTO_CBSP, "CBSP" }, - { CBC_PEER_PROTO_SABP, "SABP" }, - { CBC_PEER_PROTO_SBcAP, "SBc-AP" }, - { 0, NULL } -}; - /* remove a peer from the message */ int cbc_message_del_peer(struct cbc_message *cbcmsg, struct cbc_peer *peer) { @@ -79,80 +72,3 @@ return 0; } #endif - - -/* look-up of cbc_peer by name */ -struct cbc_peer *cbc_peer_by_name(const char *name) -{ - struct cbc_peer *peer; - - llist_for_each_entry(peer, &g_cbc->peers, list) { - if (peer->name && !strcmp(name, peer->name)) - return peer; - } - return NULL; -} - -/* look-up of cbc_peer by tuple of (remote host, protocol) */ -struct cbc_peer *cbc_peer_by_addr_proto(const char *remote_host, uint16_t remote_port, - enum cbc_peer_protocol proto) -{ - struct cbc_peer *peer; - - llist_for_each_entry(peer, &g_cbc->peers, list) { - unsigned int i; - for (i = 0; i < peer->num_remote_host; i++) { - if (peer->proto != proto) - continue; - if (!strcasecmp(remote_host, peer->remote_host[i])) { - if (peer->remote_port == -1) - return peer; - else if (remote_port == peer->remote_port) - return peer; - } - } - } - return NULL; -} - -/* create a new cbc_peer */ -struct cbc_peer *cbc_peer_create(const char *name, enum cbc_peer_protocol proto) -{ - struct cbc_peer *peer; - if (name && cbc_peer_by_name(name)) - return NULL; - - peer = talloc_zero(g_cbc, struct cbc_peer); - if (!peer) - return NULL; - - peer->proto = proto; - peer->name = talloc_strdup(peer, name); - llist_add_tail(&peer->list, &g_cbc->peers); - - return peer; -} - -/* remove a cbc_peer */ -void cbc_peer_remove(struct cbc_peer *peer) -{ - struct cbc_message *cbcmsg; - - /* close any existing client connection */ - switch (peer->proto) { - case CBC_PEER_PROTO_CBSP: - if (peer->client.cbsp) - cbsp_cbc_client_close(peer->client.cbsp); - break; - default: - OSMO_ASSERT(0); - } - - /* iterate over messages; remove client from all message_peers */ - llist_for_each_entry(cbcmsg, &g_cbc->messages, list) { - cbc_message_del_peer(cbcmsg, peer); - } - - llist_del(&peer->list); - talloc_free(peer); -} diff --git a/src/cbc_peer.c b/src/cbc_peer.c new file mode 100644 index 0000000..3e6d778 --- /dev/null +++ b/src/cbc_peer.c @@ -0,0 +1,115 @@ +/* Osmocom CBC (Cell Broacast Centre) */ + +/* (C) 2019 by Harald Welte <laforge(a)gnumonks.org> + * All Rights Reserved + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +#include <string.h> +#include <errno.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> + +#include <osmocom/cbc/cbc_peer.h> +#include <osmocom/cbc/cbsp_server.h> + +const struct value_string cbc_peer_proto_name[] = { + { CBC_PEER_PROTO_CBSP, "CBSP" }, + { CBC_PEER_PROTO_SABP, "SABP" }, + { CBC_PEER_PROTO_SBcAP, "SBc-AP" }, + { 0, NULL } +}; + +/* create a new cbc_peer */ +struct cbc_peer *cbc_peer_create(const char *name, enum cbc_peer_protocol proto) +{ + struct cbc_peer *peer; + if (name && cbc_peer_by_name(name)) + return NULL; + + peer = talloc_zero(g_cbc, struct cbc_peer); + if (!peer) + return NULL; + + peer->proto = proto; + peer->name = talloc_strdup(peer, name); + llist_add_tail(&peer->list, &g_cbc->peers); + + return peer; +} + +/* remove a cbc_peer */ +void cbc_peer_remove(struct cbc_peer *peer) +{ + struct cbc_message *cbcmsg; + + /* close any existing client connection */ + switch (peer->proto) { + case CBC_PEER_PROTO_CBSP: + if (peer->client.cbsp) + cbsp_cbc_client_close(peer->client.cbsp); + break; + default: + OSMO_ASSERT(0); + } + + /* iterate over messages; remove client from all message_peers */ + llist_for_each_entry(cbcmsg, &g_cbc->messages, list) { + cbc_message_del_peer(cbcmsg, peer); + } + + llist_del(&peer->list); + talloc_free(peer); +} + +/* look-up of cbc_peer by name */ +struct cbc_peer *cbc_peer_by_name(const char *name) +{ + struct cbc_peer *peer; + + llist_for_each_entry(peer, &g_cbc->peers, list) { + if (peer->name && !strcmp(name, peer->name)) + return peer; + } + return NULL; +} + +/* look-up of cbc_peer by tuple of (remote host, protocol) */ +struct cbc_peer *cbc_peer_by_addr_proto(const char *remote_host, uint16_t remote_port, + enum cbc_peer_protocol proto) +{ + struct cbc_peer *peer; + + llist_for_each_entry(peer, &g_cbc->peers, list) { + unsigned int i; + for (i = 0; i < peer->num_remote_host; i++) { + if (peer->proto != proto) + continue; + if (!strcasecmp(remote_host, peer->remote_host[i])) { + if (peer->remote_port == -1) + return peer; + else if (remote_port == peer->remote_port) + return peer; + } + } + } + return NULL; +} diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 916adc2..030f9e6 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -31,6 +31,7 @@ #include <osmocom/vty/vty.h> #include <osmocom/cbc/cbc_data.h> +#include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/internal.h> #include <osmocom/cbc/cbsp_server.h> #include <osmocom/cbc/sbcap_server.h> diff --git a/src/cbsp_server.c b/src/cbsp_server.c index 4e47baf..58206e8 100644 --- a/src/cbsp_server.c +++ b/src/cbsp_server.c @@ -33,6 +33,7 @@ #include <osmocom/cbc/internal.h> #include <osmocom/cbc/cbsp_server.h> +#include <osmocom/cbc/cbc_peer.h> #if 0 struct osmo_cbsp_bsc { diff --git a/src/cbsp_server_fsm.c b/src/cbsp_server_fsm.c index 903e08a..8062364 100644 --- a/src/cbsp_server_fsm.c +++ b/src/cbsp_server_fsm.c @@ -22,6 +22,7 @@ #include <osmocom/gsm/cbsp.h> +#include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/cbsp_server.h> #include <osmocom/cbc/internal.h> diff --git a/src/message_handling.c b/src/message_handling.c index 3344a75..23c0ace 100644 --- a/src/message_handling.c +++ b/src/message_handling.c @@ -33,6 +33,7 @@ #include <osmocom/cbc/sbcap_msg.h> #include <osmocom/cbc/rest_it_op.h> #include <osmocom/cbc/internal.h> +#include <osmocom/cbc/cbc_peer.h> /* convert cbc_message to osmo_cbsp_cell_list */ static int cbcmsg_to_cbsp_cell_list(const void *ctx, struct osmo_cbsp_cell_list *list, diff --git a/src/sbcap_server.c b/src/sbcap_server.c index 159fa89..2f78322 100644 --- a/src/sbcap_server.c +++ b/src/sbcap_server.c @@ -37,6 +37,7 @@ #include <osmocom/cbc/internal.h> #include <osmocom/cbc/sbcap_server.h> +#include <osmocom/cbc/cbc_peer.h> const char *sbcap_cbc_client_name(const struct osmo_sbcap_cbc_client *client) { diff --git a/src/sbcap_server_fsm.c b/src/sbcap_server_fsm.c index 11bbf28..43c5ddb 100644 --- a/src/sbcap_server_fsm.c +++ b/src/sbcap_server_fsm.c @@ -27,6 +27,7 @@ #include <osmocom/cbc/sbcap_server.h> #include <osmocom/cbc/internal.h> +#include <osmocom/cbc/cbc_peer.h> #define S(x) (1 << (x)) diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index c72a8b4..9c840fa 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -35,6 +35,7 @@ #include <osmocom/sbcap/sbcap_common.h> #include <osmocom/cbc/cbc_data.h> +#include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/cbsp_server.h> #include <osmocom/cbc/sbcap_server.h> #include <osmocom/cbc/sbcap_msg.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I41c890d81e76ac1a1c89d42af70a1f0631e9724e Gerrit-Change-Number: 28692 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-cbc[master]: sbcap_server: Log all sctp notif
by pespin 20 Jul '22

20 Jul '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28690 ) Change subject: sbcap_server: Log all sctp notif ...................................................................... sbcap_server: Log all sctp notif Change-Id: Ibe73f1e976f088154c2a20e2c7dd98b39a475c08 --- M src/sbcap_server.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/90/28690/1 diff --git a/src/sbcap_server.c b/src/sbcap_server.c index 16f5daf..56beae6 100644 --- a/src/sbcap_server.c +++ b/src/sbcap_server.c @@ -89,7 +89,11 @@ case SCTP_ASSOC_CHANGE: LOGPSBCAPC(client, LOGL_DEBUG, "Rx sctp notif SCTP_ASSOC_CHANGE: %s\n", osmo_sctp_assoc_chg_str(notif->sn_assoc_change.sac_state)); + break; default: + LOGPSBCAPC(client, LOGL_DEBUG, "Rx sctp notif %s (%u)\n", + osmo_sctp_sn_type_str(notif->sn_header.sn_type), + notif->sn_header.sn_type); break; } rc = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ibe73f1e976f088154c2a20e2c7dd98b39a475c08 Gerrit-Change-Number: 28690 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-cbc[master]: sbcap_server: Fix double-free of rx msg if conn is destroyed
by pespin 20 Jul '22

20 Jul '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28691 ) Change subject: sbcap_server: Fix double-free of rx msg if conn is destroyed ...................................................................... sbcap_server: Fix double-free of rx msg if conn is destroyed In sbcap_cbc_read_cb(), if sctp_recvmsg() fails and we end up calling osmo_stream_srv_destroy(conn), then both conn and client will end up being freed by sbcap_cbc_closed_cb(), so we cannot use them anymore after calling osmo_stream_srv_destroy(conn). Furthermore, since msg was allocated with "client" ctx as parent, it would also be freed when "client" was freed. Let's make the logic easier and alloc it under g_cbc, which is guaranteed to always be kept there. Change-Id: I201f44efa24a514e0087b6dcd01115b9b2b8e9db --- M src/sbcap_server.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/91/28691/1 diff --git a/src/sbcap_server.c b/src/sbcap_server.c index 56beae6..159fa89 100644 --- a/src/sbcap_server.c +++ b/src/sbcap_server.c @@ -59,7 +59,7 @@ struct osmo_sbcap_cbc *cbc = osmo_stream_srv_link_get_data(link); struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); SBcAP_SBC_AP_PDU_t *pdu; - struct msgb *msg = msgb_alloc_c(client, 1500, "SBcAP-rx"); + struct msgb *msg = msgb_alloc_c(g_cbc, 1500, "SBcAP-rx"); struct sctp_sndrcvinfo sinfo; int flags = 0; int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I201f44efa24a514e0087b6dcd01115b9b2b8e9db Gerrit-Change-Number: 28691 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-cbc[master]: sbcap_server.c: Remove unneeded goto
by pespin 20 Jul '22

20 Jul '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28689 ) Change subject: sbcap_server.c: Remove unneeded goto ...................................................................... sbcap_server.c: Remove unneeded goto Change-Id: I02cf8e7ec05d5189d9c6dcc9a7b1e4def80220d7 --- M src/sbcap_server.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/89/28689/1 diff --git a/src/sbcap_server.c b/src/sbcap_server.c index e111675..16f5daf 100644 --- a/src/sbcap_server.c +++ b/src/sbcap_server.c @@ -93,7 +93,6 @@ break; } rc = 0; - goto out; } if (rc == 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I02cf8e7ec05d5189d9c6dcc9a7b1e4def80220d7 Gerrit-Change-Number: 28689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: cbc: Fix f_sbcap_tx_stop_warn_resp()
by pespin 20 Jul '22

20 Jul '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28688 ) Change subject: cbc: Fix f_sbcap_tx_stop_warn_resp() ...................................................................... cbc: Fix f_sbcap_tx_stop_warn_resp() The line was wrongly removed when pushing a new version of the patch for review submission. Fixes: 7c13cb7e0f3679e58cfba0e666166626b464cfca Change-Id: If99ff5b83e8f0c577e60e0406b001a3753213deb --- M cbc/CBC_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/28688/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index b3ef64d..2abd33e 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -315,6 +315,8 @@ runs on test_CT { var template (value) SBC_AP_PDU tx; /* TODO: pass Unknown Tracking Area List as parameter above (omit by default) */ + tx := ts_SBCAP_WRITE_WARNING_RESP(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16)); f_SBC_AP_send(tx, idx); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28688 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: If99ff5b83e8f0c577e60e0406b001a3753213deb Gerrit-Change-Number: 28688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in ...osmo_dia2gsup[master]: diameter: Change default bind IP to 127.0.0.8
by daniel 20 Jul '22

20 Jul '22

daniel has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28656 ) Change subject: diameter: Change default bind IP to 127.0.0.8 ...................................................................... diameter: Change default bind IP to 127.0.0.8 The IP 127.0.0.4 is already used by the open5gs smf. Since the mme by default tries to connect to the hss at 127.0.0.8 let's change the default here to something that works ootb. Change-Id: Ibe36e86e6473caab753308837b2ced0f1b53e1f2 --- M src/osmo_dia2gsup.erl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_dia2gsup.erl b/src/osmo_dia2gsup.erl index be8e87c..a4edd71 100644 --- a/src/osmo_dia2gsup.erl +++ b/src/osmo_dia2gsup.erl @@ -69,7 +69,7 @@ % DIAMETER side SvcName = ?MODULE, diameter:start_service(SvcName, ?SERVICE(SvcName)), - Ip = application:get_env(osmo_dia2gsup, diameter_ip, "127.0.0.4"), + Ip = application:get_env(osmo_dia2gsup, diameter_ip, "127.0.0.8"), Port = application:get_env(osmo_dia2gsup, diameter_port, 3868), Proto = application:get_env(osmo_dia2gsup, diameter_proto, sctp), listen({address, Proto, element(2,inet:parse_address(Ip)), Port}), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Ibe36e86e6473caab753308837b2ced0f1b53e1f2 Gerrit-Change-Number: 28656 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in ...osmo_dia2gsup[master]: diameter: Change default bind IP to 127.0.0.8
by daniel 20 Jul '22

20 Jul '22

Attention is currently required from: fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28656 ) Change subject: diameter: Change default bind IP to 127.0.0.8 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Ibe36e86e6473caab753308837b2ced0f1b53e1f2 Gerrit-Change-Number: 28656 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 15:51:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...osmo_dia2gsup[master]: diameter: Change default bind IP to 127.0.0.8
by daniel 20 Jul '22

20 Jul '22

Attention is currently required from: fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28656 ) Change subject: diameter: Change default bind IP to 127.0.0.8 ...................................................................... Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28656/comment/8c029cda_… PS1, Line 9: used by the smf > It may not be obvious for some reviewers that you're talking about open5gs. Thanks, changed Patchset: PS2: Readding +2 from before -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Ibe36e86e6473caab753308837b2ced0f1b53e1f2 Gerrit-Change-Number: 28656 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 15:51:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in ...osmo_dia2gsup[master]: diameter: Change default bind IP to 127.0.0.8
by daniel 20 Jul '22

20 Jul '22

Attention is currently required from: daniel. Hello Jenkins Builder, fixeria, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28656 to look at the new patch set (#2). Change subject: diameter: Change default bind IP to 127.0.0.8 ...................................................................... diameter: Change default bind IP to 127.0.0.8 The IP 127.0.0.4 is already used by the open5gs smf. Since the mme by default tries to connect to the hss at 127.0.0.8 let's change the default here to something that works ootb. Change-Id: Ibe36e86e6473caab753308837b2ced0f1b53e1f2 --- M src/osmo_dia2gsup.erl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/56/28656/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Ibe36e86e6473caab753308837b2ced0f1b53e1f2 Gerrit-Change-Number: 28656 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmocom-bb[master]: trxcon: fix coding style in statements applying inverted mask
by dexter 20 Jul '22

20 Jul '22

Attention is currently required from: osmith, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28672 ) Change subject: trxcon: fix coding style in statements applying inverted mask ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I28b9fc34e0d40b02d0ca56e9e0bf4463cf4ff336 Gerrit-Change-Number: 28672 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 15:44:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log