This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/22416 ) Change subject: VTY: don't save dynamically-allocated "unknown" peers ...................................................................... VTY: don't save dynamically-allocated "unknown" peers The VTY code should write/save only those peers that were configured using the VTY. Closes: OS#4929 Change-Id: If02694be4e4cb9cb27e7d9d07e533bfed4a999a9 --- M src/cbc_data.h M src/cbc_vty.c M src/cbsp_server.c 3 files changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/cbc_data.h b/src/cbc_data.h index e88ae45..d6fc3d2 100644 --- a/src/cbc_data.h +++ b/src/cbc_data.h @@ -26,6 +26,7 @@ char *remote_host; /* remote IP address in string format */ 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 { diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 98e2703..9a36aa4 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -494,8 +494,12 @@ static int config_write_peer(struct vty *vty) { struct cbc_peer *peer; - llist_for_each_entry(peer, &g_cbc->peers, list) + llist_for_each_entry(peer, &g_cbc->peers, list) { + /* only save those configured via the VTY, not the "unknown" peers */ + if (peer->unknown_dynamic_peer) + continue; write_one_peer(vty, peer); + } return CMD_SUCCESS; } diff --git a/src/cbsp_server.c b/src/cbsp_server.c index 8a62790..3aa6332 100644 --- a/src/cbsp_server.c +++ b/src/cbsp_server.c @@ -150,6 +150,7 @@ remote_ip, remote_port); client->peer = cbc_peer_create(NULL, CBC_PEER_PROTO_CBSP); OSMO_ASSERT(client->peer); + client->peer->unknown_dynamic_peer = true; } else { LOGPCC(client, LOGL_NOTICE, "Rejecting unknown CBSP peer %s:%d (not permitted)\n", remote_ip, remote_port); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/22416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If02694be4e4cb9cb27e7d9d07e533bfed4a999a9 Gerrit-Change-Number: 22416 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge at osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210125/3e2781a3/attachment.htm>