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

Change in osmo-bsc-nat[master]: bssap: forward paging to relevant BSCs only

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767 ) Change subject: bssap: forward paging to relevant BSCs only ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc-nat/bssap.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767/comment/4654e15d_e6169b1f PS1, Line 62: if (!(e = TLVP_GET(&tp, GSM0808_IE_CELL_IDENTIFIER_LIST))) { > is it mandatory IE? Maybe page all BSCs if not present? Yes it is mandatory in paging from MSC side. See 3GPP TS 48.008 § 3.2.1.19. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767 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: Iad3d1de8339206fa80f9fd10ac9213a7728a3c73 Gerrit-Change-Number: 27767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Apr 2022 14:03:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap: forward paging to relevant BSCs only

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767 ) Change subject: bssap: forward paging to relevant BSCs only ...................................................................... Patch Set 1: (2 comments) Patchset: PS1: IIRC we used to have per-bsc VTY node configuring data like LAC. Why did we decide to not go that way and do it dynamically using extenion IEs? I don't recall hearing any discussions regarding this topic. File src/osmo-bsc-nat/bssap.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767/comment/31891996_275d4419 PS1, Line 62: if (!(e = TLVP_GET(&tp, GSM0808_IE_CELL_IDENTIFIER_LIST))) { is it mandatory IE? Maybe page all BSCs if not present? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767 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: Iad3d1de8339206fa80f9fd10ac9213a7728a3c73 Gerrit-Change-Number: 27767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Apr 2022 13:55:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap: forward paging to relevant BSCs only

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767 ) Change subject: bssap: forward paging to relevant BSCs only ...................................................................... bssap: forward paging to relevant BSCs only With osmo-bsc I28e0f9497043e90f999b593602b7ffd812787430, OsmoBSC can be configured to send a cell identifier list in BSSMAP reset. Use this to send pagings only to relevant BSCs instead of all BSCs. Related: SYS#5560 Related: OS#5522 Change-Id: Iad3d1de8339206fa80f9fd10ac9213a7728a3c73 --- M include/osmocom/bsc_nat/bsc.h M src/osmo-bsc-nat/bsc.c M src/osmo-bsc-nat/bssap.c 3 files changed, 104 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/67/27767/1 diff --git a/include/osmocom/bsc_nat/bsc.h b/include/osmocom/bsc_nat/bsc.h index 7c11a82..20af445 100644 --- a/include/osmocom/bsc_nat/bsc.h +++ b/include/osmocom/bsc_nat/bsc.h @@ -19,14 +19,19 @@ #pragma once +#include <osmocom/gsm/gsm0808_utils.h> #include <osmocom/sigtran/sccp_sap.h> struct bsc { struct llist_head list; struct osmo_sccp_addr addr; + struct gsm0808_cell_id_list2 cil; }; struct bsc *bsc_alloc(struct osmo_sccp_addr *addr); struct bsc *bsc_get_by_pc(uint32_t pointcode); + +bool bsc_cil_match(struct bsc *bsc, struct gsm0808_cell_id_list2 *cil); + void bsc_free(struct bsc *bsc); void bsc_free_subscr_conn_all(struct bsc *bsc); diff --git a/src/osmo-bsc-nat/bsc.c b/src/osmo-bsc-nat/bsc.c index 0461909..744ebfc 100644 --- a/src/osmo-bsc-nat/bsc.c +++ b/src/osmo-bsc-nat/bsc.c @@ -52,6 +52,60 @@ return NULL; } +bool bsc_cil_match(struct bsc *bsc, struct gsm0808_cell_id_list2 *cil) +{ + unsigned int i, j; + const struct osmo_lac_and_ci_id *bsc_id; + + /* OsmoBSC sends cell identifier list with discriminator LAC and CI, + * see gsm_bts_cell_id() in osmo-bsc.git. */ + if (bsc->cil.id_discr != CELL_IDENT_LAC_AND_CI) { + LOGP(DMAIN, LOGL_ERROR, "%s: unexpected id_discr 0x%x, assuming match\n", talloc_get_name(bsc), + bsc->cil.id_discr); + return true; + } + + for (i = 0; i < bsc->cil.id_list_len; i++) { + bsc_id = &bsc->cil.id_list[i].lac_and_ci; + + for (j = 0; j < cil->id_list_len; j++) { + switch (cil->id_discr) { + case CELL_IDENT_NO_CELL: + case CELL_IDENT_BSS: + return true; + + case CELL_IDENT_WHOLE_GLOBAL: + if (bsc_id->lac == cil->id_list[j].global.lai.lac + && bsc_id->ci == cil->id_list[j].global.cell_identity) + return true; + + case CELL_IDENT_LAC_AND_CI: + if (bsc_id->lac == cil->id_list[j].lac_and_ci.lac + && bsc_id->ci == cil->id_list[j].lac_and_ci.ci) + return true; + + case CELL_IDENT_CI: + if (bsc_id->ci == cil->id_list[j].ci) + return true; + + case CELL_IDENT_LAI_AND_LAC: + if (bsc_id->lac == cil->id_list[j].lai_and_lac.lac) + return true; + + case CELL_IDENT_LAC: + if (bsc_id->lac == cil->id_list[j].lac) + return true; + default: + LOGP(DMAIN, LOGL_ERROR, "%s(0x%x) is not implemented, assuming match\n", __func__, cil->id_discr); + return true; + } + + } + } + + return false; +} + void bsc_free_subscr_conn_all(struct bsc *bsc) { struct subscr_conn *subscr_conn; diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index 8e73a50..893d1a6 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -45,6 +45,9 @@ struct bsc *bsc; int ret = 0; int rc; + struct tlv_parsed tp; + struct tlv_p_entry *e; + struct gsm0808_cell_id_list2 cil; if (msc->addr.pc != addr->pc) { LOGP(DMAIN, LOGL_ERROR, "Unexpected Rx PAGING in CN from %s, which is not %s\n", @@ -54,10 +57,32 @@ LOGP(DMAIN, LOGL_DEBUG, "Rx PAGING from %s\n", talloc_get_name(msc)); + tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l3h + 1, length - 1, 0, 0); + + if (!(e = TLVP_GET(&tp, GSM0808_IE_CELL_IDENTIFIER_LIST))) { + LOGP(DMAIN, LOGL_ERROR, "Missing IE: cell identifier list\n"); + return -1; + } + if (gsm0808_dec_cell_id_list2(&cil, e->val, e->len) < 0) { + LOGP(DMAIN, LOGL_ERROR, "Invalid IE: cell identifier list\n"); + return -1; + } + msgb_pull_to_l2(msg); - /* Page all BSCs */ + /* Page all relevant BSCs */ llist_for_each_entry(bsc, &g_bsc_nat->ran.bscs, list) { + if (bsc->cil.id_list_len) { + if (!bsc_cil_match(bsc, &cil)) { + LOGP(DMAIN, LOGL_DEBUG, "%s: cell identifier list doesn't match\n", + talloc_get_name(bsc)); + continue; + } + } else { + LOGP(DMAIN, LOGL_DEBUG, "%s: no cell identifier list, can't check if paging is relevant\n", + talloc_get_name(bsc)); + } + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", talloc_get_name(bsc)); rc = osmo_sccp_tx_unitdata(sccp_inst->scu, &sccp_inst->addr, @@ -112,13 +137,31 @@ { struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran.sccp_inst; struct bsc *bsc; + struct tlv_parsed tp; + struct tlv_p_entry *e; + struct gsm0808_cell_id_list2 cil; + + tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l3h + 1, length - 1, 0, 0); + + /* Osmocom extension: BSSMAP RESET may contain a cell identifier list, + * which OsmoBSCNAT uses in paging code (OS#5522) */ + if ((e = TLVP_GET(&tp, GSM0808_IE_CELL_IDENTIFIER_LIST))) { + if (gsm0808_dec_cell_id_list2(&cil, e->val, e->len) < 0) { + LOGP(DMAIN, LOGL_ERROR, "Invalid IE: cell identifier list\n"); + return -1; + } + } /* Store the BSC, since RESET was done the BSCNAT should accept its messages */ bsc = bsc_get_by_pc(addr->pc); if (!bsc) bsc = bsc_alloc(addr); - LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr_ran(addr)); + if (e) + bsc->cil = cil; + + LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s (%s cell identifier list)\n", bsc_nat_print_addr_ran(addr), + e ? "with" : "without"); LOGP(DMAIN, LOGL_NOTICE, "Tx RESET ACK to %s\n", bsc_nat_print_addr_ran(addr)); msg = gsm0808_create_reset_ack(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767 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: Iad3d1de8339206fa80f9fd10ac9213a7728a3c73 Gerrit-Change-Number: 27767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: Add Cell Identifier List to BSSMAP RESET

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27766 ) Change subject: Add Cell Identifier List to BSSMAP RESET ...................................................................... Add Cell Identifier List to BSSMAP RESET Allow optionally sending the Cell Identifier List with the BSSMAP RESET. This Osmocom extension will be used by OsmoBSCNAT to forward paging only to relevant BSCs. Related: SYS#5560 Related: OS#5522 Change-Id: I28e0f9497043e90f999b593602b7ffd812787430 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/osmo_bsc_sigtran.c 3 files changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/27766/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 3568716..f0675ac 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -180,6 +180,9 @@ enum osmux_usage use_osmux; /* Whether we detected the MSC supports Osmux (during BSSMAP_RESET) */ bool remote_supports_osmux; + /* Whether we add Cell Identifier List to BSSMAP_RESET towards this + * MSC (OS#5522) */ + bool reset_add_cil; /* Proxy between IPA/SCCPlite encapsulated MGCP and UDP */ struct { diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 5976721..5ffed38 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2591,6 +2591,9 @@ VTY_NEWLINE); } + if (msc->reset_add_cil) + vty_out(vty, " reset-add-cil%s", VTY_NEWLINE); + msc_write_nri(vty, msc, false); if (!msc->allow_attach) @@ -2998,6 +3001,29 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_msc_reset_add_cil, + cfg_msc_reset_add_cil_cmd, + X(BSC_VTY_ATTR_NEW_LCHAN), + "reset-add-cil", + "Add Cell Identifier List to BSSMAP Reset towards MSC\n") +{ + struct bsc_msc_data *msc = bsc_msc_data(vty); + msc->reset_add_cil = true; + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_msc_no_reset_add_cil, + cfg_msc_no_reset_add_cil_cmd, + X(BSC_VTY_ATTR_NEW_LCHAN), + "no reset-add-cil", + NO_STR + "Do not add Cell Identifier List to BSSMAP Reset towards MSC\n") +{ + struct bsc_msc_data *msc = bsc_msc_data(vty); + msc->reset_add_cil = false; + return CMD_SUCCESS; +} + ALIAS_DEPRECATED(deprecated_ussd_text, cfg_net_bsc_mid_call_text_cmd, "mid-call-text .TEXT", @@ -3556,6 +3582,8 @@ install_element(MSC_NODE, &cfg_msc_mgw_x_osmo_ign_cmd); install_element(MSC_NODE, &cfg_msc_no_mgw_x_osmo_ign_cmd); install_element(MSC_NODE, &cfg_msc_osmux_cmd); + install_element(MSC_NODE, &cfg_msc_reset_add_cil_cmd); + install_element(MSC_NODE, &cfg_msc_no_reset_add_cil_cmd); return 0; } diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 04c2e99..105996b 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -80,6 +80,30 @@ msg->l3h[1] = msgb_l3len(msg) - 2; } +/* Patch regular BSSMAP RESET to add extra IE with Cell Identifier List (osmocom extension, OS#5522) */ +static void _gsm0808_extend_reset_add_cil(struct msgb *msg) +{ + struct gsm0808_cell_id_list2 cil = {}; + struct gsm0808_cell_id_list2 cil_bts; + struct gsm_bts *bts; + unsigned int bts_nr; + int rc; + + for (bts_nr = 0; bts_nr < bsc_gsmnet->num_bts; bts_nr++) { + bts = gsm_bts_num(bsc_gsmnet, bts_nr); + gsm_bts_cell_id_list(&cil_bts, bts); + rc = gsm0808_cell_id_list_add(&cil, &cil_bts); + if (rc < 0) { + LOGP(DRESET, LOGL_ERROR, "Failed to generate Cell Identifier List, omitting from RESET\n"); + return; + } + } + + OSMO_ASSERT(msg->l3h[1] == msgb_l3len(msg) - 2); /* TL not in len */ + gsm0808_enc_cell_id_list2(msg, &cil); + msg->l3h[1] = msgb_l3len(msg) - 2; +} + /* Send reset to MSC */ void osmo_bsc_sigtran_tx_reset(const struct bsc_msc_data *msc) { @@ -94,6 +118,9 @@ if (msc_is_aoip(msc) && msc->use_osmux != OSMUX_USAGE_OFF) _gsm0808_extend_announce_osmux(msg); + if (msc->reset_add_cil) + _gsm0808_extend_reset_add_cil(msg); + rate_ctr_inc(rate_ctr_group_get_ctr(msc->msc_ctrs, MSC_CTR_BSSMAP_TX_UDT_RESET)); osmo_sccp_tx_unitdata_msg(msc->a.sccp_user, &msc->a.bsc_addr, &msc->a.msc_addr, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I28e0f9497043e90f999b593602b7ffd812787430 Gerrit-Change-Number: 27766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: always check return value of rsl_tlv_parse()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27764 ) Change subject: rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I07cbd2849d83af28eb0458547f0eacc81347df23 Gerrit-Change-Number: 27764 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Apr 2022 12:05:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: misc / cosmetic fixes for tx_ipac_XXcx_nack()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27765 ) Change subject: rsl: misc / cosmetic fixes for tx_ipac_XXcx_nack() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia7367cdfc6e1b1ebaabdf21e0a050fc1543968b2 Gerrit-Change-Number: 27765 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Apr 2022 12:04:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: misc / cosmetic fixes for tx_ipac_XXcx_nack()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27765 ) Change subject: rsl: misc / cosmetic fixes for tx_ipac_XXcx_nack() ...................................................................... rsl: misc / cosmetic fixes for tx_ipac_XXcx_nack() Change-Id: Ia7367cdfc6e1b1ebaabdf21e0a050fc1543968b2 --- M src/common/rsl.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/27765/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 76a4c76..30b65fc 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2647,15 +2647,15 @@ } -/* transmit an CRCX NACK for the lchan */ +/* Send an xxCX NACK for the given xxCX message type and lchan */ static int tx_ipac_XXcx_nack(struct gsm_lchan *lchan, uint8_t cause, int inc_ipport, uint8_t orig_msgtype) { struct msgb *msg; uint8_t chan_nr = gsm_lchan2chan_nr_rsl(lchan); + uint8_t msg_type = orig_msgtype + 2; - /* FIXME: allocate new msgb and copy old over */ - LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "RSL Tx IPAC_BIND_NACK\n"); + LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "RSL Tx %s\n", rsl_ipac_msg_name(msg_type)); msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr)); if (!msg) @@ -2675,7 +2675,7 @@ msgb_tlv_put(msg, RSL_IE_CAUSE, 1, &cause); /* push the header in front */ - rsl_ipa_push_hdr(msg, orig_msgtype + 2, chan_nr); + rsl_ipa_push_hdr(msg, msg_type, chan_nr); msg->trx = lchan->ts->trx; return abis_bts_rsl_sendmsg(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia7367cdfc6e1b1ebaabdf21e0a050fc1543968b2 Gerrit-Change-Number: 27765 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: always check return value of rsl_tlv_parse()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27764 ) Change subject: rsl: always check return value of rsl_tlv_parse() ...................................................................... rsl: always check return value of rsl_tlv_parse() Change-Id: I07cbd2849d83af28eb0458547f0eacc81347df23 --- M src/common/rsl.c 1 file changed, 57 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/27764/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 961e065..76a4c76 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -498,7 +498,11 @@ struct gsm48_system_information_type_2quater *si2q; struct bitvec bv; const uint8_t *si_buf; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPTRX(trx, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(trx, RSL_ERR_PROTO, &cch->chan_nr, NULL, msg); + } /* 9.3.30 System Info Type */ if (!TLVP_PRESENT(&tp, RSL_IE_SYSINFO_TYPE)) @@ -695,7 +699,10 @@ const uint8_t *identity_lv; int rc; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPTRX(trx, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(trx, RSL_ERR_PROTO, &cch->chan_nr, NULL, msg); + } if (!TLVP_PRESENT(&tp, RSL_IE_PAGING_GROUP) || !TLVP_PRESENT(&tp, RSL_IE_MS_IDENTITY)) @@ -730,7 +737,10 @@ bool extended_cbch = false; int rc; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPTRX(trx, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(trx, RSL_ERR_PROTO, &cch->chan_nr, NULL, msg); + } if (!TLVP_PRESENT(&tp, RSL_IE_CB_CMD_TYPE) || !TLVP_PRESENT(&tp, RSL_IE_SMSCB_MSG)) @@ -759,7 +769,10 @@ struct gsm_bts *bts = trx->bts; struct tlv_parsed tp; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPTRX(trx, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(trx, RSL_ERR_PROTO, &cch->chan_nr, NULL, msg); + } if (!TLVP_PRESENT(&tp, RSL_IE_SMSCB_MSG)) return rsl_tx_error_report(trx, RSL_ERR_MAND_IE_ERROR, &cch->chan_nr, NULL, msg); @@ -848,7 +861,10 @@ uint8_t rsl_si; enum osmo_sysinfo_type osmo_si; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPTRX(trx, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(trx, RSL_ERR_PROTO, NULL, NULL, msg); + } /* 9.3.30 System Info Type */ if (!TLVP_PRESENT(&tp, RSL_IE_SYSINFO_TYPE)) @@ -1105,14 +1121,11 @@ struct gsm_power_ctrl_params *params; const struct tlv_p_entry *ie; struct tlv_parsed tp; - int rc; LOGPTRX(trx, DRSL, LOGL_INFO, "Rx Measurement Pre-processing Defaults\n"); - rc = rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); - if (rc < 0) { - LOGPTRX(trx, DRSL, LOGL_ERROR, "Failed to parse ip.access specific " - "Measurement Pre-processing Defaults for MS/BS Power control\n"); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPTRX(trx, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); return rsl_tx_error_report(trx, RSL_ERR_PROTO, NULL, NULL, msg); } @@ -1161,7 +1174,10 @@ struct abis_rsl_cchan_hdr *cch = msgb_l2(msg); struct tlv_parsed tp; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPTRX(trx, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(trx, RSL_ERR_PROTO, &cch->chan_nr, NULL, msg); + } if (!TLVP_PRESENT(&tp, RSL_IE_FULL_IMM_ASS_INFO)) return rsl_tx_error_report(trx, RSL_ERR_MAND_IE_ERROR, &cch->chan_nr, NULL, msg); @@ -1713,7 +1729,10 @@ .current = 0, }; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_PROTO); + } /* 9.3.3 Activation Type */ if (!TLVP_PRESENT(&tp, RSL_IE_ACT_TYPE)) { @@ -2068,7 +2087,8 @@ uint8_t link_id; if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(msg->trx, RSL_ERR_PROTO, &dch->chan_nr, NULL, msg); } if (!TLVP_PRESENT(&tp, RSL_IE_ENCR_INFO) || @@ -2189,7 +2209,10 @@ uint8_t cause; int rc; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_mode_modif_nack(lchan, RSL_ERR_PROTO); + } /* 9.3.6 Channel Mode */ if (rsl_handle_chan_mod_ie(lchan, &tp, &cause) != 0) @@ -2255,7 +2278,10 @@ uint8_t pwr; int max_pwr, curr_pwr; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(msg->trx, RSL_ERR_PROTO, &dch->chan_nr, NULL, msg); + } /* 9.3.13 MS Power (M) */ if (!TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) @@ -2318,7 +2344,10 @@ struct tlv_parsed tp; uint8_t old, new; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(trx, RSL_ERR_PROTO, &dch->chan_nr, NULL, msg); + } /* 9.3.4 BS Power (M) */ if (!TLVP_PRES_LEN(&tp, RSL_IE_BS_POWER, 1)) @@ -2391,7 +2420,10 @@ struct tlv_parsed tp; uint8_t rsl_si, osmo_si; - rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_error_report(msg->trx, RSL_ERR_PROTO, &dch->chan_nr, NULL, msg); + } if (TLVP_PRESENT(&tp, RSL_IE_STARTNG_TIME)) { LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Starting time not supported\n"); @@ -2730,10 +2762,10 @@ return tx_ipac_XXcx_nack(lchan, 0x52, 0, dch->c.msg_type); - rc = rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); - if (rc < 0) - return tx_ipac_XXcx_nack(lchan, RSL_ERR_MAND_IE_ERROR, - 0, dch->c.msg_type); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return tx_ipac_XXcx_nack(lchan, RSL_ERR_PROTO, 0, dch->c.msg_type); + } LOGPLCHAN(lchan, DRSL, LOGL_DEBUG, "IPAC_%s: ", name); if (TLVP_PRES_LEN(&tp, RSL_IE_IPAC_REMOTE_IP, 4)) { @@ -2908,9 +2940,10 @@ struct gsm_lchan *lchan = msg->lchan; int rc, inc_conn_id = 0; - rc = rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); - if (rc < 0) - return rsl_tx_ipac_dlcx_nack(lchan, 0, RSL_ERR_MAND_IE_ERROR); + if (rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)) < 0) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return rsl_tx_ipac_dlcx_nack(lchan, 0, RSL_ERR_PROTO); + } if (TLVP_PRESENT(&tp, RSL_IE_IPAC_CONN_ID)) inc_conn_id = 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I07cbd2849d83af28eb0458547f0eacc81347df23 Gerrit-Change-Number: 27764 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-uecups[master]: Move several objects outside of main.c

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27747 ) Change subject: Move several objects outside of main.c ...................................................................... Move several objects outside of main.c This makes it far more easy to understand the data model and find stuff in code. Change-Id: I4613361dc40518edd94f2d4128ba412337690736 --- M daemon/Makefile.am A daemon/cups_client.c A daemon/gtp_daemon.c M daemon/internal.h M daemon/main.c 5 files changed, 726 insertions(+), 659 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 7d41766..2d62f11 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -36,10 +36,12 @@ $(NULL) osmo_uecups_daemon_SOURCES = \ + cups_client.c \ utility.c \ netdev.c \ netns.c \ tun_device.c \ + gtp_daemon.c \ gtp_endpoint.c \ gtp_tunnel.c \ daemon_vty.c \ diff --git a/daemon/cups_client.c b/daemon/cups_client.c new file mode 100644 index 0000000..c9d8652 --- /dev/null +++ b/daemon/cups_client.c @@ -0,0 +1,612 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <unistd.h> +#include <stdint.h> +#include <stdbool.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include <pthread.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/exec.h> + +#include "internal.h" + +#include <netinet/sctp.h> + +/*********************************************************************** + * Client (Control/User Plane Separation) Socket + ***********************************************************************/ + +#define CUPS_MSGB_SIZE 1024 + +#define LOGCC(cc, lvl, fmt, args ...) \ + LOGP(DUECUPS, lvl, "%s: " fmt, (cc)->sockname, ## args) + +struct subprocess { + /* member in daemon->cups_clients */ + struct llist_head list; + /* pointer to the client that started us */ + struct cups_client *cups_client; + /* PID of the process */ + pid_t pid; +}; + +static json_t *gen_uecups_term_ind(pid_t pid, int status); + +/* kill the specified subprocess and forget about it */ +static void subprocess_destroy(struct subprocess *p, int signal) +{ + LOGCC(p->cups_client, LOGL_DEBUG, "Kill subprocess pid %llu with signal %u\n", + (unsigned long long)p->pid, signal); + kill(p->pid, signal); + llist_del(&p->list); + talloc_free(p); +} + +static struct subprocess *subprocess_by_pid(struct gtp_daemon *d, pid_t pid) +{ + struct subprocess *sproc; + llist_for_each_entry(sproc, &d->subprocesses, list) { + if (sproc->pid == pid) + return sproc; + } + return NULL; +} + +void child_terminated(struct gtp_daemon *d, int pid, int status) +{ + struct subprocess *sproc; + json_t *jterm_ind; + + LOGP(DUECUPS, LOGL_DEBUG, "SIGCHLD receive from pid %u; status=%d\n", pid, status); + + sproc = subprocess_by_pid(d, pid); + if (!sproc) { + LOGP(DUECUPS, LOGL_NOTICE, "subprocess %u terminated (status=%d) but we don't know it?\n", + pid, status); + return; + } + + /* generate prog_term_ind towards control plane */ + jterm_ind = gen_uecups_term_ind(pid, status); + if (!jterm_ind) + return; + + cups_client_tx_json(sproc->cups_client, jterm_ind); + + llist_del(&sproc->list); + talloc_free(sproc); +} + +/* Send JSON to a given client/connection */ +int cups_client_tx_json(struct cups_client *cc, json_t *jtx) +{ + struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Tx JSON"); + char *json_str = json_dumps(jtx, JSON_SORT_KEYS); + char *out; + int json_strlen; + + json_decref(jtx); + if (!json_str) { + LOGCC(cc, LOGL_ERROR, "Error encoding JSON\n"); + return 0; + } + json_strlen = strlen(json_str); + + LOGCC(cc, LOGL_DEBUG, "JSON Tx '%s'\n", json_str); + + if (json_strlen > msgb_tailroom(msg)) { + LOGCC(cc, LOGL_ERROR, "Not enough room for JSON in msgb\n"); + free(json_str); + return 0; + } + + out = (char *)msgb_put(msg, json_strlen); + memcpy(out, json_str, json_strlen); + free(json_str); + osmo_stream_srv_send(cc->srv, msg); + + return 0; +} + +json_t *gen_uecups_result(const char *name, const char *res) +{ + json_t *jres = json_object(); + json_t *jret = json_object(); + + json_object_set_new(jres, "result", json_string(res)); + json_object_set_new(jret, name, jres); + + return jret; +} + +static int parse_ep(struct sockaddr_storage *out, json_t *in) +{ + json_t *jaddr_type, *jport, *jip; + const char *addr_type, *ip; + uint8_t buf[16]; + + /* {"addr_type":"IPV4","ip":"31323334","Port":2152} */ + + if (!json_is_object(in)) + return -EINVAL; + + jaddr_type = json_object_get(in, "addr_type"); + jport = json_object_get(in, "Port"); + jip = json_object_get(in, "ip"); + + if (!jaddr_type || !jport || !jip) + return -EINVAL; + + if (!json_is_string(jaddr_type) || !json_is_integer(jport) || !json_is_string(jip)) + return -EINVAL; + + addr_type = json_string_value(jaddr_type); + ip = json_string_value(jip); + + memset(out, 0, sizeof(*out)); + + if (!strcmp(addr_type, "IPV4")) { + struct sockaddr_in *sin = (struct sockaddr_in *) out; + if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) + return -EINVAL; + memcpy(&sin->sin_addr, buf, 4); + sin->sin_family = AF_INET; + sin->sin_port = htons(json_integer_value(jport)); + } else if (!strcmp(addr_type, "IPV6")) { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; + if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) + return -EINVAL; + memcpy(&sin6->sin6_addr, buf, 16); + sin6->sin6_family = AF_INET6; + sin6->sin6_port = htons(json_integer_value(jport)); + } else + return -EINVAL; + + return 0; +} + +static int parse_eua(struct sockaddr_storage *out, json_t *jip, json_t *jaddr_type) +{ + const char *addr_type, *ip; + uint8_t buf[16]; + + if (!json_is_string(jip) || !json_is_string(jaddr_type)) + return -EINVAL; + + addr_type = json_string_value(jaddr_type); + ip = json_string_value(jip); + + memset(out, 0, sizeof(*out)); + + if (!strcmp(addr_type, "IPV4")) { + struct sockaddr_in *sin = (struct sockaddr_in *) out; + if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) + return -EINVAL; + memcpy(&sin->sin_addr, buf, 4); + sin->sin_family = AF_INET; + } else if (!strcmp(addr_type, "IPV6")) { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; + if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) + return -EINVAL; + memcpy(&sin6->sin6_addr, buf, 16); + sin6->sin6_family = AF_INET6; + } else + return -EINVAL; + + return 0; +} + + +static int parse_create_tun(struct gtp_tunnel_params *out, json_t *ctun) +{ + json_t *jlocal_gtp_ep, *jremote_gtp_ep; + json_t *jrx_teid, *jtx_teid; + json_t *jtun_dev_name, *jtun_netns_name; + json_t *juser_addr, *juser_addr_type; + int rc; + + /* '{"create_tun":{"tx_teid":1234,"rx_teid":5678,"user_addr_type":"IPV4","user_addr":"21222324","local_gtp_ep":{"addr_type":"IPV4","ip":"31323334","Port":2152},"remote_gtp_ep":{"addr_type":"IPV4","ip":"41424344","Port":2152},"tun_dev_name":"tun23","tun_netns_name":"foo"}}' */ + + if (!json_is_object(ctun)) + return -EINVAL; + + /* mandatory IEs */ + jlocal_gtp_ep = json_object_get(ctun, "local_gtp_ep"); + jremote_gtp_ep = json_object_get(ctun, "remote_gtp_ep"); + jrx_teid = json_object_get(ctun, "rx_teid"); + jtx_teid = json_object_get(ctun, "tx_teid"); + jtun_dev_name = json_object_get(ctun, "tun_dev_name"); + juser_addr = json_object_get(ctun, "user_addr"); + juser_addr_type = json_object_get(ctun, "user_addr_type"); + + if (!jlocal_gtp_ep || !jremote_gtp_ep || !jrx_teid || !jtx_teid || !jtun_dev_name || + !juser_addr || !juser_addr_type) + return -EINVAL; + if (!json_is_object(jlocal_gtp_ep) || !json_is_object(jremote_gtp_ep) || + !json_is_integer(jrx_teid) || !json_is_integer(jtx_teid) || + !json_is_string(jtun_dev_name) || + !json_is_string(juser_addr) || !json_is_string(juser_addr_type)) + return -EINVAL; + + memset(out, 0, sizeof(*out)); + + rc = parse_ep(&out->local_udp, jlocal_gtp_ep); + if (rc < 0) + return rc; + rc = parse_ep(&out->remote_udp, jremote_gtp_ep); + if (rc < 0) + return rc; + rc = parse_eua(&out->user_addr, juser_addr, juser_addr_type); + if (rc < 0) + return rc; + out->rx_teid = json_integer_value(jrx_teid); + out->tx_teid = json_integer_value(jtx_teid); + out->tun_name = talloc_strdup(out, json_string_value(jtun_dev_name)); + + /* optional IEs */ + jtun_netns_name = json_object_get(ctun, "tun_netns_name"); + if (jtun_netns_name) { + if (!json_is_string(jtun_netns_name)) + return -EINVAL; + out->tun_netns_name = talloc_strdup(out, json_string_value(jtun_netns_name)); + } + + return 0; +} + + +static int cups_client_handle_create_tun(struct cups_client *cc, json_t *ctun) +{ + int rc; + struct gtp_tunnel_params *tpars = talloc_zero(cc, struct gtp_tunnel_params); + struct gtp_tunnel *t; + + rc = parse_create_tun(tpars, ctun); + if (rc < 0) { + talloc_free(tpars); + return rc; + } + + t = gtp_tunnel_alloc(g_daemon, tpars); + if (!t) { + LOGCC(cc, LOGL_NOTICE, "Failed to allocate tunnel\n"); + cups_client_tx_json(cc, gen_uecups_result("create_tun_res", "ERR_NOT_FOUND")); + } else { + cups_client_tx_json(cc, gen_uecups_result("create_tun_res", "OK")); + } + + talloc_free(tpars); + return 0; +} + +static int cups_client_handle_destroy_tun(struct cups_client *cc, json_t *dtun) +{ + struct sockaddr_storage local_ep_addr; + json_t *jlocal_gtp_ep, *jrx_teid; + uint32_t rx_teid; + int rc; + + jlocal_gtp_ep = json_object_get(dtun, "local_gtp_ep"); + jrx_teid = json_object_get(dtun, "rx_teid"); + + if (!jlocal_gtp_ep || !jrx_teid) + return -EINVAL; + + if (!json_is_object(jlocal_gtp_ep) || !json_is_integer(jrx_teid)) + return -EINVAL; + + rc = parse_ep(&local_ep_addr, jlocal_gtp_ep); + if (rc < 0) + return rc; + rx_teid = json_integer_value(jrx_teid); + + rc = gtp_tunnel_destroy(g_daemon, &local_ep_addr, rx_teid); + if (rc < 0) { + LOGCC(cc, LOGL_NOTICE, "Failed to destroy tunnel\n"); + cups_client_tx_json(cc, gen_uecups_result("destroy_tun_res", "ERR_NOT_FOUND")); + } else { + cups_client_tx_json(cc, gen_uecups_result("destroy_tun_res", "OK")); + } + + return 0; +} + +static json_t *gen_uecups_term_ind(pid_t pid, int status) +{ + json_t *jterm = json_object(); + json_t *jret = json_object(); + + json_object_set_new(jterm, "pid", json_integer(pid)); + json_object_set_new(jterm, "exit_code", json_integer(status)); + + json_object_set_new(jret, "program_term_ind", jterm); + + return jret; +} + +static json_t *gen_uecups_start_res(pid_t pid, const char *result) +{ + json_t *ret = gen_uecups_result("start_program_res", result); + json_object_set_new(json_object_get(ret, "start_program_res"), "pid", json_integer(pid)); + + return ret; +} + +static int cups_client_handle_start_program(struct cups_client *cc, json_t *sprog) +{ + json_t *juser, *jcmd, *jenv, *jnetns, *jres; + struct gtp_daemon *d = cc->d; + const char *cmd, *user; + char **addl_env = NULL; + sigset_t oldmask; + int nsfd = -1, rc; + + juser = json_object_get(sprog, "run_as_user"); + jcmd = json_object_get(sprog, "command"); + jenv = json_object_get(sprog, "environment"); + jnetns = json_object_get(sprog, "tun_netns_name"); + + /* mandatory parts */ + if (!juser || !jcmd) + return -EINVAL; + if (!json_is_string(juser) || !json_is_string(jcmd)) + return -EINVAL; + + /* optional parts */ + if (jenv && !json_is_array(jenv)) + return -EINVAL; + if (jnetns && !json_is_string(jnetns)) + return -EINVAL; + + cmd = json_string_value(jcmd); + user = json_string_value(juser); + if (jnetns) { + struct tun_device *tun = tun_device_find_netns(d, json_string_value(jnetns)); + if (!tun) + return -ENODEV; + nsfd = tun->netns_fd; + } + + /* build environment */ + if (jenv) { + json_t *j; + int i; + addl_env = talloc_zero_array(cc, char *, json_array_size(jenv)+1); + if (!addl_env) + return -ENOMEM; + json_array_foreach(jenv, i, j) { + addl_env[i] = talloc_strdup(addl_env, json_string_value(j)); + } + } + + if (jnetns) { + rc = switch_ns(nsfd, &oldmask); + if (rc < 0) { + talloc_free(addl_env); + return -EIO; + } + } + + rc = osmo_system_nowait2(cmd, osmo_environment_whitelist, addl_env, user); + + if (jnetns) { + OSMO_ASSERT(restore_ns(&oldmask) == 0); + } + + talloc_free(addl_env); + + if (rc > 0) { + /* create a record about the subprocess we started, so we can notify the + * client that crated it upon termination */ + struct subprocess *sproc = talloc_zero(cc, struct subprocess); + if (!sproc) + return -ENOMEM; + + sproc->cups_client = cc; + sproc->pid = rc; + llist_add_tail(&sproc->list, &d->subprocesses); + jres = gen_uecups_start_res(sproc->pid, "OK"); + } else { + jres = gen_uecups_start_res(0, "ERR_INVALID_DATA"); + } + + cups_client_tx_json(cc, jres); + + return 0; +} + +static int cups_client_handle_reset_all_state(struct cups_client *cc, json_t *sprog) +{ + struct gtp_daemon *d = cc->d; + struct gtp_tunnel *t, *t2; + struct subprocess *p, *p2; + json_t *jres; + + LOGCC(cc, LOGL_DEBUG, "Destroying all tunnels\n"); + pthread_rwlock_wrlock(&d->rwlock); + llist_for_each_entry_safe(t, t2, &d->gtp_tunnels, list) { + _gtp_tunnel_destroy(t); + } + pthread_rwlock_unlock(&d->rwlock); + + /* no locking needed as this list is only used by main thread */ + LOGCC(cc, LOGL_DEBUG, "Destroying all subprocesses\n"); + llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { + subprocess_destroy(p, SIGKILL); + } + + if (d->reset_all_state_tun_remaining == 0) { + jres = gen_uecups_result("reset_all_state_res", "OK"); + cups_client_tx_json(cc, jres); + } else { + cc->reset_all_state_res_pending = true; + } + + return 0; +} + +static int cups_client_handle_json(struct cups_client *cc, json_t *jroot) +{ + void *iter; + const char *key; + json_t *cmd; + int rc; + + if (!json_is_object(jroot)) + return -EINVAL; + + iter = json_object_iter(jroot); + key = json_object_iter_key(iter); + cmd = json_object_iter_value(iter); + if (!iter || !key || !cmd) + return -EINVAL; + + if (!strcmp(key, "create_tun")) { + rc = cups_client_handle_create_tun(cc, cmd); + } else if (!strcmp(key, "destroy_tun")) { + rc = cups_client_handle_destroy_tun(cc, cmd); + } else if (!strcmp(key, "start_program")) { + rc = cups_client_handle_start_program(cc, cmd); + } else if (!strcmp(key, "reset_all_state")) { + rc = cups_client_handle_reset_all_state(cc, cmd); + } else { + LOGCC(cc, LOGL_NOTICE, "Unknown command '%s' received\n", key); + return -EINVAL; + } + + if (rc < 0) { + LOGCC(cc, LOGL_NOTICE, "Error %d handling '%s' command\n", rc, key); + char buf[64]; + snprintf(buf, sizeof(buf), "%s_res", key); + cups_client_tx_json(cc, gen_uecups_result(buf, "ERR_INVALID_DATA")); + return -EINVAL; + } + + return 0; +} + +/* control/user plane separation per-client read cb */ +static int cups_client_read_cb(struct osmo_stream_srv *conn) +{ + struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); + struct cups_client *cc = osmo_stream_srv_get_data(conn); + struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Rx JSON"); + struct sctp_sndrcvinfo sinfo; + json_error_t jerr; + json_t *jroot; + int flags = 0; + int rc = 0; + + /* Read message from socket */ + /* we cannot use osmo_stream_srv_recv() here, as we might get some out-of-band info from + * SCTP. FIXME: add something like osmo_stream_srv_recv_sctp() to libosmo-netif and use + * it here as well as in libosmo-sigtran and osmo-msc */ + rc = sctp_recvmsg(ofd->fd, msg->tail, msgb_tailroom(msg), NULL, NULL, &sinfo, &flags); + if (rc <= 0) { + osmo_stream_srv_destroy(conn); + rc = -1; + goto out; + } else + msgb_put(msg, rc); + + if (flags & MSG_NOTIFICATION) { + union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); + switch (notif->sn_header.sn_type) { + case SCTP_SHUTDOWN_EVENT: + osmo_stream_srv_destroy(conn); + rc = -EBADF; + goto out; + default: + break; + } + goto out; + } + + LOGCC(cc, LOGL_DEBUG, "Rx '%s'\n", msgb_data(msg)); + + /* Parse the JSON */ + jroot = json_loadb((const char *) msgb_data(msg), msgb_length(msg), 0, &jerr); + if (!jroot) { + LOGCC(cc, LOGL_ERROR, "Error decoding JSON (%s)", jerr.text); + rc = -1; + goto out; + } + + /* Dispatch */ + rc = cups_client_handle_json(cc, jroot); + + json_decref(jroot); + msgb_free(msg); + + return 0; +out: + msgb_free(msg); + return rc; +} + +static int cups_client_closed_cb(struct osmo_stream_srv *conn) +{ + struct cups_client *cc = osmo_stream_srv_get_data(conn); + struct gtp_daemon *d = cc->d; + struct subprocess *p, *p2; + + /* kill + forget about all subprocesses of this client */ + /* We need no locking here as the subprocess list is only used from the main thread */ + llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { + if (p->cups_client == cc) + subprocess_destroy(p, SIGKILL); + } + + LOGCC(cc, LOGL_INFO, "UECUPS connection lost\n"); + llist_del(&cc->list); + return 0; +} + + +/* the control/user plane separation server bind/accept fd */ +static int cups_accept_cb(struct osmo_stream_srv_link *link, int fd) +{ + struct gtp_daemon *d = osmo_stream_srv_link_get_data(link); + struct cups_client *cc; + + cc = talloc_zero(d, struct cups_client); + if (!cc) + return -1; + + cc->d = d; + osmo_sock_get_name_buf(cc->sockname, sizeof(cc->sockname), fd); + cc->srv = osmo_stream_srv_create(cc, link, fd, cups_client_read_cb, cups_client_closed_cb, cc); + if (!cc->srv) { + talloc_free(cc); + return -1; + } + LOGCC(cc, LOGL_INFO, "Accepted new UECUPS connection\n"); + + llist_add_tail(&cc->list, &d->cups_clients); + + return 0; +} + +struct osmo_stream_srv_link *cups_srv_link_create(struct gtp_daemon *d) +{ + struct osmo_stream_srv_link *srv_link; + srv_link = osmo_stream_srv_link_create(g_daemon); + if (!srv_link) + return NULL; + + /* UECUPS socket for control from control plane side */ + osmo_stream_srv_link_set_nodelay(srv_link, true); + osmo_stream_srv_link_set_addr(srv_link, g_daemon->cfg.cups_local_ip); + osmo_stream_srv_link_set_port(srv_link, g_daemon->cfg.cups_local_port); + osmo_stream_srv_link_set_proto(srv_link, IPPROTO_SCTP); + osmo_stream_srv_link_set_data(srv_link, g_daemon); + osmo_stream_srv_link_set_accept_cb(srv_link, cups_accept_cb); + osmo_stream_srv_link_open(srv_link); + return srv_link; +} diff --git a/daemon/gtp_daemon.c b/daemon/gtp_daemon.c new file mode 100644 index 0000000..b5b7ac8 --- /dev/null +++ b/daemon/gtp_daemon.c @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <unistd.h> +#include <stdint.h> +#include <stdbool.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <assert.h> +#include <errno.h> + +#include <pthread.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/logging.h> + +#include "internal.h" + + +/*********************************************************************** + * GTP Daemon + ***********************************************************************/ + +#ifndef OSMO_VTY_PORT_UECUPS +#define OSMO_VTY_PORT_UECUPS 4268 +#endif + +struct gtp_daemon *g_daemon; + +static void gtp_daemon_itq_read_cb(struct osmo_it_q *q, struct llist_head *item) +{ + struct gtp_daemon *d = (struct gtp_daemon *)q->data; + struct gtp_daemon_itq_msg *itq_msg = container_of(item, struct gtp_daemon_itq_msg, list); + + LOGP(DTUN, LOGL_DEBUG, "Rx new itq message from %s\n", + itq_msg->tun_released.tun->devname); + + _tun_device_destroy(itq_msg->tun_released.tun); + if (d->reset_all_state_tun_remaining > 0) { + d->reset_all_state_tun_remaining--; + if (d->reset_all_state_tun_remaining == 0) { + struct cups_client *cc; + llist_for_each_entry(cc, &d->cups_clients, list) { + json_t *jres; + if (!cc->reset_all_state_res_pending) + continue; + cc->reset_all_state_res_pending = false; + jres = gen_uecups_result("reset_all_state_res", "OK"); + cups_client_tx_json(cc, jres); + } + } + } +} + +struct gtp_daemon *gtp_daemon_alloc(void *ctx) +{ + struct gtp_daemon *d = talloc_zero(ctx, struct gtp_daemon); + if (!d) + return NULL; + + INIT_LLIST_HEAD(&d->gtp_endpoints); + INIT_LLIST_HEAD(&d->tun_devices); + INIT_LLIST_HEAD(&d->gtp_tunnels); + INIT_LLIST_HEAD(&d->subprocesses); + pthread_rwlock_init(&d->rwlock, NULL); + d->main_thread = pthread_self(); + + d->itq = osmo_it_q_alloc(d, "itq", 4096, gtp_daemon_itq_read_cb, d); + osmo_fd_register(&d->itq->event_ofd); + + INIT_LLIST_HEAD(&d->cups_clients); + + d->cfg.cups_local_ip = talloc_strdup(d, "localhost"); + d->cfg.cups_local_port = UECUPS_SCTP_PORT; + + return d; +} diff --git a/daemon/internal.h b/daemon/internal.h index fc5708d..25a8f91 100644 --- a/daemon/internal.h +++ b/daemon/internal.h @@ -1,14 +1,22 @@ /* SPDX-License-Identifier: GPL-2.0 */ #pragma once +#include "netns.h" + #include <stdint.h> #include <stdbool.h> #include <pthread.h> #include <sys/socket.h> + +#include <jansson.h> + #include <osmocom/core/linuxlist.h> #include <osmocom/core/write_queue.h> #include <osmocom/core/it_q.h> #include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> + +#include <osmocom/netif/stream.h> struct nl_sock; struct osmo_stream_srv_link; @@ -140,6 +148,25 @@ bool tun_device_release(struct tun_device *tun); +/*********************************************************************** + * Client (Control/User Plane Separation) Socket + ***********************************************************************/ + +struct cups_client { + /* member in daemon->cups_clients */ + struct llist_head list; + /* back-pointer to daemon */ + struct gtp_daemon *d; + /* client socket */ + struct osmo_stream_srv *srv; + char sockname[OSMO_SOCK_NAME_MAXLEN]; + bool reset_all_state_res_pending; +}; + +struct osmo_stream_srv_link *cups_srv_link_create(struct gtp_daemon *d); +void child_terminated(struct gtp_daemon *d, int pid, int status); +json_t *gen_uecups_result(const char *name, const char *res); +int cups_client_tx_json(struct cups_client *cc, json_t *jtx); /*********************************************************************** * GTP Tunnel @@ -247,4 +274,6 @@ }; extern struct gtp_daemon *g_daemon; +struct gtp_daemon *gtp_daemon_alloc(void *ctx); + int gtpud_vty_init(void); diff --git a/daemon/main.c b/daemon/main.c index 9f1885f..e5a8147 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -24,7 +24,6 @@ #include <osmocom/core/stats.h> #include <osmocom/core/rate_ctr.h> #include <osmocom/core/socket.h> -#include <osmocom/core/exec.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> #include <osmocom/vty/stats.h> @@ -33,7 +32,6 @@ #include <osmocom/vty/misc.h> #include <osmocom/netif/stream.h> -#include <netinet/sctp.h> #include <jansson.h> @@ -41,330 +39,13 @@ #include "netns.h" #include "gtp.h" -/*********************************************************************** - * Client (Contol/User Plane Separation) Socket - ***********************************************************************/ +static void *g_tall_ctx; +static char *g_config_file = "osmo-uecups-daemon.cfg"; +static int g_daemonize; +extern struct vty_app_info g_vty_info; #include <pwd.h> -#define CUPS_MSGB_SIZE 1024 - -#define LOGCC(cc, lvl, fmt, args ...) \ - LOGP(DUECUPS, lvl, "%s: " fmt, (cc)->sockname, ## args) - -struct cups_client { - /* member in daemon->cups_clients */ - struct llist_head list; - /* back-pointer to daemon */ - struct gtp_daemon *d; - /* client socket */ - struct osmo_stream_srv *srv; - char sockname[OSMO_SOCK_NAME_MAXLEN]; - bool reset_all_state_res_pending; -}; - -struct subprocess { - /* member in daemon->cups_clients */ - struct llist_head list; - /* pointer to the client that started us */ - struct cups_client *cups_client; - /* PID of the process */ - pid_t pid; -}; - -/* kill the specified subprocess and forget about it */ -static void subprocess_destroy(struct subprocess *p, int signal) -{ - LOGCC(p->cups_client, LOGL_DEBUG, "Kill subprocess pid %llu with signal %u\n", - (unsigned long long)p->pid, signal); - kill(p->pid, signal); - llist_del(&p->list); - talloc_free(p); -} - -/* Send JSON to a given client/connection */ -static int cups_client_tx_json(struct cups_client *cc, json_t *jtx) -{ - struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Tx JSON"); - char *json_str = json_dumps(jtx, JSON_SORT_KEYS); - char *out; - int json_strlen; - - json_decref(jtx); - if (!json_str) { - LOGCC(cc, LOGL_ERROR, "Error encoding JSON\n"); - return 0; - } - json_strlen = strlen(json_str); - - LOGCC(cc, LOGL_DEBUG, "JSON Tx '%s'\n", json_str); - - if (json_strlen > msgb_tailroom(msg)) { - LOGCC(cc, LOGL_ERROR, "Not enough room for JSON in msgb\n"); - free(json_str); - return 0; - } - - out = (char *)msgb_put(msg, json_strlen); - memcpy(out, json_str, json_strlen); - free(json_str); - osmo_stream_srv_send(cc->srv, msg); - - return 0; -} - -static json_t *gen_uecups_result(const char *name, const char *res) -{ - json_t *jres = json_object(); - json_t *jret = json_object(); - - json_object_set_new(jres, "result", json_string(res)); - json_object_set_new(jret, name, jres); - - return jret; -} - -static int parse_ep(struct sockaddr_storage *out, json_t *in) -{ - json_t *jaddr_type, *jport, *jip; - const char *addr_type, *ip; - uint8_t buf[16]; - - /* {"addr_type":"IPV4","ip":"31323334","Port":2152} */ - - if (!json_is_object(in)) - return -EINVAL; - - jaddr_type = json_object_get(in, "addr_type"); - jport = json_object_get(in, "Port"); - jip = json_object_get(in, "ip"); - - if (!jaddr_type || !jport || !jip) - return -EINVAL; - - if (!json_is_string(jaddr_type) || !json_is_integer(jport) || !json_is_string(jip)) - return -EINVAL; - - addr_type = json_string_value(jaddr_type); - ip = json_string_value(jip); - - memset(out, 0, sizeof(*out)); - - if (!strcmp(addr_type, "IPV4")) { - struct sockaddr_in *sin = (struct sockaddr_in *) out; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) - return -EINVAL; - memcpy(&sin->sin_addr, buf, 4); - sin->sin_family = AF_INET; - sin->sin_port = htons(json_integer_value(jport)); - } else if (!strcmp(addr_type, "IPV6")) { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) - return -EINVAL; - memcpy(&sin6->sin6_addr, buf, 16); - sin6->sin6_family = AF_INET6; - sin6->sin6_port = htons(json_integer_value(jport)); - } else - return -EINVAL; - - return 0; -} - -static int parse_eua(struct sockaddr_storage *out, json_t *jip, json_t *jaddr_type) -{ - const char *addr_type, *ip; - uint8_t buf[16]; - - if (!json_is_string(jip) || !json_is_string(jaddr_type)) - return -EINVAL; - - addr_type = json_string_value(jaddr_type); - ip = json_string_value(jip); - - memset(out, 0, sizeof(*out)); - - if (!strcmp(addr_type, "IPV4")) { - struct sockaddr_in *sin = (struct sockaddr_in *) out; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) - return -EINVAL; - memcpy(&sin->sin_addr, buf, 4); - sin->sin_family = AF_INET; - } else if (!strcmp(addr_type, "IPV6")) { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) - return -EINVAL; - memcpy(&sin6->sin6_addr, buf, 16); - sin6->sin6_family = AF_INET6; - } else - return -EINVAL; - - return 0; -} - - -static int parse_create_tun(struct gtp_tunnel_params *out, json_t *ctun) -{ - json_t *jlocal_gtp_ep, *jremote_gtp_ep; - json_t *jrx_teid, *jtx_teid; - json_t *jtun_dev_name, *jtun_netns_name; - json_t *juser_addr, *juser_addr_type; - int rc; - - /* '{"create_tun":{"tx_teid":1234,"rx_teid":5678,"user_addr_type":"IPV4","user_addr":"21222324","local_gtp_ep":{"addr_type":"IPV4","ip":"31323334","Port":2152},"remote_gtp_ep":{"addr_type":"IPV4","ip":"41424344","Port":2152},"tun_dev_name":"tun23","tun_netns_name":"foo"}}' */ - - if (!json_is_object(ctun)) - return -EINVAL; - - /* mandatory IEs */ - jlocal_gtp_ep = json_object_get(ctun, "local_gtp_ep"); - jremote_gtp_ep = json_object_get(ctun, "remote_gtp_ep"); - jrx_teid = json_object_get(ctun, "rx_teid"); - jtx_teid = json_object_get(ctun, "tx_teid"); - jtun_dev_name = json_object_get(ctun, "tun_dev_name"); - juser_addr = json_object_get(ctun, "user_addr"); - juser_addr_type = json_object_get(ctun, "user_addr_type"); - - if (!jlocal_gtp_ep || !jremote_gtp_ep || !jrx_teid || !jtx_teid || !jtun_dev_name || - !juser_addr || !juser_addr_type) - return -EINVAL; - if (!json_is_object(jlocal_gtp_ep) || !json_is_object(jremote_gtp_ep) || - !json_is_integer(jrx_teid) || !json_is_integer(jtx_teid) || - !json_is_string(jtun_dev_name) || - !json_is_string(juser_addr) || !json_is_string(juser_addr_type)) - return -EINVAL; - - memset(out, 0, sizeof(*out)); - - rc = parse_ep(&out->local_udp, jlocal_gtp_ep); - if (rc < 0) - return rc; - rc = parse_ep(&out->remote_udp, jremote_gtp_ep); - if (rc < 0) - return rc; - rc = parse_eua(&out->user_addr, juser_addr, juser_addr_type); - if (rc < 0) - return rc; - out->rx_teid = json_integer_value(jrx_teid); - out->tx_teid = json_integer_value(jtx_teid); - out->tun_name = talloc_strdup(out, json_string_value(jtun_dev_name)); - - /* optional IEs */ - jtun_netns_name = json_object_get(ctun, "tun_netns_name"); - if (jtun_netns_name) { - if (!json_is_string(jtun_netns_name)) - return -EINVAL; - out->tun_netns_name = talloc_strdup(out, json_string_value(jtun_netns_name)); - } - - return 0; -} - - -static int cups_client_handle_create_tun(struct cups_client *cc, json_t *ctun) -{ - int rc; - struct gtp_tunnel_params *tpars = talloc_zero(cc, struct gtp_tunnel_params); - struct gtp_tunnel *t; - - rc = parse_create_tun(tpars, ctun); - if (rc < 0) { - talloc_free(tpars); - return rc; - } - - t = gtp_tunnel_alloc(g_daemon, tpars); - if (!t) { - LOGCC(cc, LOGL_NOTICE, "Failed to allocate tunnel\n"); - cups_client_tx_json(cc, gen_uecups_result("create_tun_res", "ERR_NOT_FOUND")); - } else { - cups_client_tx_json(cc, gen_uecups_result("create_tun_res", "OK")); - } - - talloc_free(tpars); - return 0; -} - -static int cups_client_handle_destroy_tun(struct cups_client *cc, json_t *dtun) -{ - struct sockaddr_storage local_ep_addr; - json_t *jlocal_gtp_ep, *jrx_teid; - uint32_t rx_teid; - int rc; - - jlocal_gtp_ep = json_object_get(dtun, "local_gtp_ep"); - jrx_teid = json_object_get(dtun, "rx_teid"); - - if (!jlocal_gtp_ep || !jrx_teid) - return -EINVAL; - - if (!json_is_object(jlocal_gtp_ep) || !json_is_integer(jrx_teid)) - return -EINVAL; - - rc = parse_ep(&local_ep_addr, jlocal_gtp_ep); - if (rc < 0) - return rc; - rx_teid = json_integer_value(jrx_teid); - - rc = gtp_tunnel_destroy(g_daemon, &local_ep_addr, rx_teid); - if (rc < 0) { - LOGCC(cc, LOGL_NOTICE, "Failed to destroy tunnel\n"); - cups_client_tx_json(cc, gen_uecups_result("destroy_tun_res", "ERR_NOT_FOUND")); - } else { - cups_client_tx_json(cc, gen_uecups_result("destroy_tun_res", "OK")); - } - - return 0; -} - -static json_t *gen_uecups_term_ind(pid_t pid, int status) -{ - json_t *jterm = json_object(); - json_t *jret = json_object(); - - json_object_set_new(jterm, "pid", json_integer(pid)); - json_object_set_new(jterm, "exit_code", json_integer(status)); - - json_object_set_new(jret, "program_term_ind", jterm); - - return jret; -} - - -static struct subprocess *subprocess_by_pid(struct gtp_daemon *d, pid_t pid) -{ - struct subprocess *sproc; - llist_for_each_entry(sproc, &d->subprocesses, list) { - if (sproc->pid == pid) - return sproc; - } - return NULL; -} - -static void child_terminated(struct gtp_daemon *d, int pid, int status) -{ - struct subprocess *sproc; - json_t *jterm_ind; - - LOGP(DUECUPS, LOGL_DEBUG, "SIGCHLD receive from pid %u; status=%d\n", pid, status); - - sproc = subprocess_by_pid(d, pid); - if (!sproc) { - LOGP(DUECUPS, LOGL_NOTICE, "subprocess %u terminated (status=%d) but we don't know it?\n", - pid, status); - return; - } - - /* generate prog_term_ind towards control plane */ - jterm_ind = gen_uecups_term_ind(pid, status); - if (!jterm_ind) - return; - - cups_client_tx_json(sproc->cups_client, jterm_ind); - - llist_del(&sproc->list); - talloc_free(sproc); -} - static void sigchild_cb(struct osmo_signalfd *osfd, const struct signalfd_siginfo *fdsi) { struct gtp_daemon *d = osfd->data; @@ -385,283 +66,6 @@ } -static json_t *gen_uecups_start_res(pid_t pid, const char *result) -{ - json_t *ret = gen_uecups_result("start_program_res", result); - json_object_set_new(json_object_get(ret, "start_program_res"), "pid", json_integer(pid)); - - return ret; -} - -static int cups_client_handle_start_program(struct cups_client *cc, json_t *sprog) -{ - json_t *juser, *jcmd, *jenv, *jnetns, *jres; - struct gtp_daemon *d = cc->d; - const char *cmd, *user; - char **addl_env = NULL; - sigset_t oldmask; - int nsfd = -1, rc; - - juser = json_object_get(sprog, "run_as_user"); - jcmd = json_object_get(sprog, "command"); - jenv = json_object_get(sprog, "environment"); - jnetns = json_object_get(sprog, "tun_netns_name"); - - /* mandatory parts */ - if (!juser || !jcmd) - return -EINVAL; - if (!json_is_string(juser) || !json_is_string(jcmd)) - return -EINVAL; - - /* optional parts */ - if (jenv && !json_is_array(jenv)) - return -EINVAL; - if (jnetns && !json_is_string(jnetns)) - return -EINVAL; - - cmd = json_string_value(jcmd); - user = json_string_value(juser); - if (jnetns) { - struct tun_device *tun = tun_device_find_netns(d, json_string_value(jnetns)); - if (!tun) - return -ENODEV; - nsfd = tun->netns_fd; - } - - /* build environment */ - if (jenv) { - json_t *j; - int i; - addl_env = talloc_zero_array(cc, char *, json_array_size(jenv)+1); - if (!addl_env) - return -ENOMEM; - json_array_foreach(jenv, i, j) { - addl_env[i] = talloc_strdup(addl_env, json_string_value(j)); - } - } - - if (jnetns) { - rc = switch_ns(nsfd, &oldmask); - if (rc < 0) { - talloc_free(addl_env); - return -EIO; - } - } - - rc = osmo_system_nowait2(cmd, osmo_environment_whitelist, addl_env, user); - - if (jnetns) { - OSMO_ASSERT(restore_ns(&oldmask) == 0); - } - - talloc_free(addl_env); - - if (rc > 0) { - /* create a record about the subprocess we started, so we can notify the - * client that crated it upon termination */ - struct subprocess *sproc = talloc_zero(cc, struct subprocess); - if (!sproc) - return -ENOMEM; - - sproc->cups_client = cc; - sproc->pid = rc; - llist_add_tail(&sproc->list, &d->subprocesses); - jres = gen_uecups_start_res(sproc->pid, "OK"); - } else { - jres = gen_uecups_start_res(0, "ERR_INVALID_DATA"); - } - - cups_client_tx_json(cc, jres); - - return 0; -} - -static int cups_client_handle_reset_all_state(struct cups_client *cc, json_t *sprog) -{ - struct gtp_daemon *d = cc->d; - struct gtp_tunnel *t, *t2; - struct subprocess *p, *p2; - json_t *jres; - - LOGCC(cc, LOGL_DEBUG, "Destroying all tunnels\n"); - pthread_rwlock_wrlock(&d->rwlock); - llist_for_each_entry_safe(t, t2, &d->gtp_tunnels, list) { - _gtp_tunnel_destroy(t); - } - pthread_rwlock_unlock(&d->rwlock); - - /* no locking needed as this list is only used by main thread */ - LOGCC(cc, LOGL_DEBUG, "Destroying all subprocesses\n"); - llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { - subprocess_destroy(p, SIGKILL); - } - - if (d->reset_all_state_tun_remaining == 0) { - jres = gen_uecups_result("reset_all_state_res", "OK"); - cups_client_tx_json(cc, jres); - } else { - cc->reset_all_state_res_pending = true; - } - - return 0; -} - -static int cups_client_handle_json(struct cups_client *cc, json_t *jroot) -{ - void *iter; - const char *key; - json_t *cmd; - int rc; - - if (!json_is_object(jroot)) - return -EINVAL; - - iter = json_object_iter(jroot); - key = json_object_iter_key(iter); - cmd = json_object_iter_value(iter); - if (!iter || !key || !cmd) - return -EINVAL; - - if (!strcmp(key, "create_tun")) { - rc = cups_client_handle_create_tun(cc, cmd); - } else if (!strcmp(key, "destroy_tun")) { - rc = cups_client_handle_destroy_tun(cc, cmd); - } else if (!strcmp(key, "start_program")) { - rc = cups_client_handle_start_program(cc, cmd); - } else if (!strcmp(key, "reset_all_state")) { - rc = cups_client_handle_reset_all_state(cc, cmd); - } else { - LOGCC(cc, LOGL_NOTICE, "Unknown command '%s' received\n", key); - return -EINVAL; - } - - if (rc < 0) { - LOGCC(cc, LOGL_NOTICE, "Error %d handling '%s' command\n", rc, key); - char buf[64]; - snprintf(buf, sizeof(buf), "%s_res", key); - cups_client_tx_json(cc, gen_uecups_result(buf, "ERR_INVALID_DATA")); - return -EINVAL; - } - - return 0; -} - -/* control/user plane separation per-client read cb */ -static int cups_client_read_cb(struct osmo_stream_srv *conn) -{ - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); - struct cups_client *cc = osmo_stream_srv_get_data(conn); - struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Rx JSON"); - struct sctp_sndrcvinfo sinfo; - json_error_t jerr; - json_t *jroot; - int flags = 0; - int rc = 0; - - /* Read message from socket */ - /* we cannot use osmo_stream_srv_recv() here, as we might get some out-of-band info from - * SCTP. FIXME: add something like osmo_stream_srv_recv_sctp() to libosmo-netif and use - * it here as well as in libosmo-sigtran and osmo-msc */ - rc = sctp_recvmsg(ofd->fd, msg->tail, msgb_tailroom(msg), NULL, NULL, &sinfo,&flags); - if (rc <= 0) { - osmo_stream_srv_destroy(conn); - rc = -1; - goto out; - } else - msgb_put(msg, rc); - - if (flags & MSG_NOTIFICATION) { - union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); - switch (notif->sn_header.sn_type) { - case SCTP_SHUTDOWN_EVENT: - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - default: - break; - } - goto out; - } - - LOGCC(cc, LOGL_DEBUG, "Rx '%s'\n", msgb_data(msg)); - - /* Parse the JSON */ - jroot = json_loadb((const char *) msgb_data(msg), msgb_length(msg), 0, &jerr); - if (!jroot) { - LOGCC(cc, LOGL_ERROR, "Error decoding JSON (%s)", jerr.text); - rc = -1; - goto out; - } - - /* Dispatch */ - rc = cups_client_handle_json(cc, jroot); - - json_decref(jroot); - msgb_free(msg); - - return 0; -out: - msgb_free(msg); - return rc; -} - -static int cups_client_closed_cb(struct osmo_stream_srv *conn) -{ - struct cups_client *cc = osmo_stream_srv_get_data(conn); - struct gtp_daemon *d = cc->d; - struct subprocess *p, *p2; - - /* kill + forget about all subprocesses of this client */ - /* We need no locking here as the subprocess list is only used from the main thread */ - llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { - if (p->cups_client == cc) - subprocess_destroy(p, SIGKILL); - } - - LOGCC(cc, LOGL_INFO, "UECUPS connection lost\n"); - llist_del(&cc->list); - return 0; -} - - -/* the control/user plane separation server bind/accept fd */ -static int cups_accept_cb(struct osmo_stream_srv_link *link, int fd) -{ - struct gtp_daemon *d = osmo_stream_srv_link_get_data(link); - struct cups_client *cc; - - cc = talloc_zero(d, struct cups_client); - if (!cc) - return -1; - - cc->d = d; - osmo_sock_get_name_buf(cc->sockname, sizeof(cc->sockname), fd); - cc->srv = osmo_stream_srv_create(cc, link, fd, cups_client_read_cb, cups_client_closed_cb, cc); - if (!cc->srv) { - talloc_free(cc); - return -1; - } - LOGCC(cc, LOGL_INFO, "Accepted new UECUPS connection\n"); - - llist_add_tail(&cc->list, &d->cups_clients); - - return 0; -} - -/*********************************************************************** - * GTP Daemon - ***********************************************************************/ - -#ifndef OSMO_VTY_PORT_UECUPS -#define OSMO_VTY_PORT_UECUPS 4268 -#endif - -static void *g_tall_ctx; -struct gtp_daemon *g_daemon; -static int g_daemonize; -static char *g_config_file = "osmo-uecups-daemon.cfg"; -extern struct vty_app_info g_vty_info; - static void signal_cb(struct osmo_signalfd *osfd, const struct signalfd_siginfo *fdsi) { switch (fdsi->ssi_signo) { @@ -676,55 +80,6 @@ } } -static void gtp_daemon_itq_read_cb(struct osmo_it_q *q, struct llist_head *item) -{ - struct gtp_daemon *d = (struct gtp_daemon *)q->data; - struct gtp_daemon_itq_msg *itq_msg = container_of(item, struct gtp_daemon_itq_msg, list); - - LOGP(DTUN, LOGL_DEBUG, "Rx new itq message from %s\n", - itq_msg->tun_released.tun->devname); - - _tun_device_destroy(itq_msg->tun_released.tun); - if (d->reset_all_state_tun_remaining > 0) { - d->reset_all_state_tun_remaining--; - if (d->reset_all_state_tun_remaining == 0) { - struct cups_client *cc; - llist_for_each_entry(cc, &d->cups_clients, list) { - json_t *jres; - if (!cc->reset_all_state_res_pending) - continue; - cc->reset_all_state_res_pending = false; - jres = gen_uecups_result("reset_all_state_res", "OK"); - cups_client_tx_json(cc, jres); - } - } - } -} - -static struct gtp_daemon *gtp_daemon_alloc(void *ctx) -{ - struct gtp_daemon *d = talloc_zero(ctx, struct gtp_daemon); - if (!d) - return NULL; - - INIT_LLIST_HEAD(&d->gtp_endpoints); - INIT_LLIST_HEAD(&d->tun_devices); - INIT_LLIST_HEAD(&d->gtp_tunnels); - INIT_LLIST_HEAD(&d->subprocesses); - pthread_rwlock_init(&d->rwlock, NULL); - d->main_thread = pthread_self(); - - d->itq = osmo_it_q_alloc(d, "itq", 4096, gtp_daemon_itq_read_cb, d); - osmo_fd_register(&d->itq->event_ofd); - - INIT_LLIST_HEAD(&d->cups_clients); - - d->cfg.cups_local_ip = talloc_strdup(d, "localhost"); - d->cfg.cups_local_port = UECUPS_SCTP_PORT; - - return d; -} - static const struct log_info_cat log_categories[] = { [DTUN] = { .name ="DTUN", @@ -883,22 +238,14 @@ if (rc < 0) exit(1); - g_daemon->cups_link = osmo_stream_srv_link_create(g_daemon); + /* UECUPS socket for control from control plane side */ + g_daemon->cups_link = cups_srv_link_create(g_daemon); if (!g_daemon->cups_link) { fprintf(stderr, "Failed to create CUPS socket %s:%u (%s)\n", g_daemon->cfg.cups_local_ip, g_daemon->cfg.cups_local_port, strerror(errno)); exit(1); } - /* UECUPS socket for control from control plane side */ - osmo_stream_srv_link_set_nodelay(g_daemon->cups_link, true); - osmo_stream_srv_link_set_addr(g_daemon->cups_link, g_daemon->cfg.cups_local_ip); - osmo_stream_srv_link_set_port(g_daemon->cups_link, g_daemon->cfg.cups_local_port); - osmo_stream_srv_link_set_proto(g_daemon->cups_link, IPPROTO_SCTP); - osmo_stream_srv_link_set_data(g_daemon->cups_link, g_daemon); - osmo_stream_srv_link_set_accept_cb(g_daemon->cups_link, cups_accept_cb); - osmo_stream_srv_link_open(g_daemon->cups_link); - /* block SIGCHLD via normal delivery; redirect it to signalfd */ sigset_t sigset; sigemptyset(&sigset); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4613361dc40518edd94f2d4128ba412337690736 Gerrit-Change-Number: 27747 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Avoid generating zero-length packets

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 ) Change subject: Avoid generating zero-length packets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 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: I818a113ff8d2a2f7cab2ec7d9c8661607c6331d6 Gerrit-Change-Number: 27763 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 13 Apr 2022 09:33:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022