February 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac ...................................................................... modem: route L1CTL prims to/from libosmo-gprs-rlcmac Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Related: OS#5500 --- M src/host/layer23/src/modem/rlcmac.c 1 file changed, 78 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/31572/1 diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c index 83dcd6c..3a391ed 100644 --- a/src/host/layer23/src/modem/rlcmac.c +++ b/src/host/layer23/src/modem/rlcmac.c @@ -36,10 +36,13 @@ #include <osmocom/gprs/llc/llc_prim.h> #include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/apn.h> #include <osmocom/bb/common/ms.h> #include <osmocom/bb/modem/rlcmac.h> +#include <l1ctl_proto.h> + static int modem_rlcmac_handle_grr(struct osmo_gprs_rlcmac_prim *rlcmac_prim) { int rc; @@ -110,12 +113,50 @@ return rc; } +static int modem_rlcmac_handle_l1ctl(struct osmocom_ms *ms, + const struct osmo_gprs_rlcmac_prim *rlcmac_prim) +{ + const struct osmo_gprs_rlcmac_l1ctl_prim *prim = &rlcmac_prim->l1ctl; + + switch (rlcmac_prim->oph.primitive) { + case OSMO_GPRS_RLCMAC_L1CTL_RACH: + if (prim->rach_req.is_11bit) { + LOGP(DRLCMAC, LOGL_NOTICE, + "%s(): 11-bit RACH is not supported\n", __func__); + return -ENOTSUP; + } + return l1ctl_tx_rach_req(ms, 0, 0, prim->rach_req.ra, 0, 0); + case OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA: + return l1ctl_tx_gprs_ul_block_req(ms, prim->pdch_data_req.fn, + prim->pdch_data_req.ts_nr, + prim->pdch_data_req.data, + prim->pdch_data_req.data_len); + case OSMO_GPRS_RLCMAC_L1CTL_CFG_UL_TBF: + return l1ctl_tx_gprs_ul_tbf_cfg_req(ms, prim->cfg_ul_tbf_req.ul_tbf_nr, + prim->cfg_ul_tbf_req.ul_slotmask); + case OSMO_GPRS_RLCMAC_L1CTL_CFG_DL_TBF: + return l1ctl_tx_gprs_dl_tbf_cfg_req(ms, prim->cfg_dl_tbf_req.dl_tbf_nr, + prim->cfg_dl_tbf_req.dl_slotmask, + prim->cfg_dl_tbf_req.dl_tfi); + default: + LOGP(DRLCMAC, LOGL_DEBUG, + "%s(): Unexpected L1CTL prim 0x%02x\n", + __func__, rlcmac_prim->oph.primitive); + return -ENOTSUP; + } +} + static int modem_rlcmac_prim_down_cb(struct osmo_gprs_rlcmac_prim *rlcmac_prim, void *user_data) { const char *pdu_name = osmo_gprs_rlcmac_prim_name(rlcmac_prim); + struct osmocom_ms *ms = user_data; int rc = 0; switch (rlcmac_prim->oph.sap) { + case OSMO_GPRS_RLCMAC_SAP_L1CTL: + LOGP(DRLCMAC, LOGL_DEBUG, "%s(): Rx %s\n", __func__, pdu_name); + rc = modem_rlcmac_handle_l1ctl(ms, rlcmac_prim); + break; default: LOGP(DRLCMAC, LOGL_DEBUG, "%s(): Unexpected Rx %s\n", __func__, pdu_name); OSMO_ASSERT(0); @@ -123,6 +164,30 @@ return rc; } +static int l1ctl_dl_block_cb(struct osmocom_ms *ms, struct msgb *msg) +{ + const struct l1ctl_gprs_dl_block_ind *ind = (void *)msg->l1h; + struct osmo_gprs_rlcmac_prim *prim; + + /* FIXME: rlcmac_prim_l1ctl_alloc() is not exposed */ + prim = rlcmac_prim_l1ctl_alloc(OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA, + PRIM_OP_INDICATION, msgb_l2len(msg)); + prim->l1ctl = (struct osmo_gprs_rlcmac_l1ctl_prim) { + .pdch_data_ind = { + /* TODO: ind->usf */ + .fn = osmo_load32be(&ind->hdr.fn), + .ts_nr = ind->hdr.tn, + .rx_lev = ind->meas.rx_lev, + .ber10k = osmo_load16be(&ind->meas.ber10k), + .ci_cb = osmo_load16be(&ind->meas.ci_cb), + .data_len = msgb_l2len(msg), + .data = msgb_l2(msg), + } + }; + + return osmo_gprs_rlcmac_prim_lower_up(prim); +} + int modem_rlcmac_init(struct osmocom_ms *ms) { int rc; @@ -134,5 +199,8 @@ osmo_gprs_rlcmac_prim_set_up_cb(modem_rlcmac_prim_up_cb, ms); osmo_gprs_rlcmac_prim_set_down_cb(modem_rlcmac_prim_down_cb, ms); + + ms->l1_entity.l1_gprs_dl_block_ind = &l1ctl_dl_block_cb; + return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: implement Rx/Tx API for GPRS related messages

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31571 ) Change subject: layer23: implement Rx/Tx API for GPRS related messages ...................................................................... layer23: implement Rx/Tx API for GPRS related messages Change-Id: I87950e893ef96ff8328f43f1548111aa9f66439b Related: OS#5500 --- M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/src/common/l1ctl.c 3 files changed, 128 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/71/31571/1 diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index 5b20506..a151a98 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -75,4 +75,16 @@ /* Transmit L1CTL_NEIGH_PM_REQ */ int l1ctl_tx_neigh_pm_req(struct osmocom_ms *ms, int num, uint16_t *arfcn); +/* Transmit L1CTL_GPRS_UL_BLOCK_REQ */ +int l1ctl_tx_gprs_ul_block_req(struct osmocom_ms *ms, uint32_t fn, uint8_t tn, + const uint8_t *data, size_t data_len); + +/* Transmit L1CTL_GPRS_UL_TBF_CFG_REQ */ +int l1ctl_tx_gprs_ul_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_nr, + uint8_t slotmask); + +/* Transmit L1CTL_GPRS_DL_TBF_CFG_REQ */ +int l1ctl_tx_gprs_dl_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_nr, + uint8_t slotmask, uint8_t dl_tfi); + #endif diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index 30bb514..e4888a7 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -36,6 +36,7 @@ struct osmol1_entity { int (*l1_traffic_ind)(struct osmocom_ms *ms, struct msgb *msg); + int (*l1_gprs_dl_block_ind)(struct osmocom_ms *ms, struct msgb *msg); }; struct osmomncc_entity { diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 34051fd..0d85625 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -978,6 +978,108 @@ return 0; } +/* Receive L1CTL_GPRS_DL_BLOCK_IND */ +static int rx_l1_gprs_dl_block_ind(struct osmocom_ms *ms, struct msgb *msg) +{ + struct l1ctl_gprs_dl_block_ind *ind = (void *)msg->l1h; + + if (msgb_l1len(msg) < sizeof(*ind)) { + LOGP(DL1C, LOGL_ERROR, + "Rx malformed L1CTL_GPRS_DL_BLOCK_IND (len=%u < %zu)\n", + msgb_l1len(msg), sizeof(*ind)); + return -EINVAL; + } + if (OSMO_UNLIKELY(ind->hdr.tn >= 8)) { + LOGP(DL1C, LOGL_ERROR, + "Rx malformed L1CTL_GPRS_DL_BLOCK_IND (TDMA Tn=%u)\n", + ind->hdr.tn); + return -EINVAL; + } + + msg->l2h = (void *)&ind->data[0]; + + DEBUGP(DL1C, "Rx GPRS DL block (flags=0x%02x, fn=%u, tn=%u, len=%u): %s\n", + ind->hdr.flags, osmo_load32be(&ind->hdr.fn), ind->hdr.tn, + msgb_l2len(msg), msgb_hexdump_l2(msg)); + + /* distribute or drop */ + if (ms->l1_entity.l1_gprs_dl_block_ind) + return ms->l1_entity.l1_gprs_dl_block_ind(ms, msg); + + msgb_free(msg); + return 0; +} + +/* Transmit L1CTL_GPRS_UL_BLOCK_REQ */ +int l1ctl_tx_gprs_ul_block_req(struct osmocom_ms *ms, uint32_t fn, uint8_t tn, + const uint8_t *data, size_t data_len) +{ + struct l1ctl_gprs_ul_block_req *req; + struct msgb *msg; + + msg = osmo_l1_alloc(L1CTL_GPRS_UL_BLOCK_REQ); + if (!msg) + return -ENOMEM; + + req = (void *)msgb_put(msg, sizeof(*req)); + req->hdr.fn = fn; + req->hdr.tn = tn; + if (data_len > 0) + memcpy(msgb_put(msg, data_len), data, data_len); + + DEBUGP(DL1C, "Tx GPRS UL block (flags=0x%02x, fn=%u, tn=%u, len=%zu): %s\n", + req->hdr.flags, fn, tn, data_len, osmo_hexdump(data, data_len)); + + return osmo_send_l1(ms, msg); +} + +/* Transmit L1CTL_GPRS_UL_TBF_CFG_REQ */ +int l1ctl_tx_gprs_ul_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_nr, + uint8_t slotmask) +{ + struct l1ctl_gprs_ul_tbf_cfg_req *req; + struct msgb *msg; + + msg = osmo_l1_alloc(L1CTL_GPRS_UL_TBF_CFG_REQ); + if (!msg) + return -ENOMEM; + + req = (void *)msgb_put(msg, sizeof(*req)); + *req = (struct l1ctl_gprs_ul_tbf_cfg_req) { + .tbf_nr = tbf_nr, + .slotmask = slotmask, + }; + + DEBUGP(DL1C, "Tx GPRS UL TBF CFG (tbf_nr=%u, slotmask=0x%02x)\n", + tbf_nr, slotmask); + + return osmo_send_l1(ms, msg); +} + +/* Transmit L1CTL_GPRS_DL_TBF_CFG_REQ */ +int l1ctl_tx_gprs_dl_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_nr, + uint8_t slotmask, uint8_t dl_tfi) +{ + struct l1ctl_gprs_dl_tbf_cfg_req *req; + struct msgb *msg; + + msg = osmo_l1_alloc(L1CTL_GPRS_DL_TBF_CFG_REQ); + if (!msg) + return -ENOMEM; + + req = (void *)msgb_put(msg, sizeof(*req)); + *req = (struct l1ctl_gprs_dl_tbf_cfg_req) { + .tbf_nr = tbf_nr, + .slotmask = slotmask, + .dl_tfi = dl_tfi, + }; + + DEBUGP(DL1C, "Tx GPRS DL TBF CFG (tbf_nr=%u, slotmask=0x%02x, dl_tfi=%u)\n", + tbf_nr, slotmask, dl_tfi); + + return osmo_send_l1(ms, msg); +} + /* Receive incoming data from L1 using L1CTL format */ int l1ctl_recv(struct osmocom_ms *ms, struct msgb *msg) { @@ -1046,6 +1148,9 @@ case L1CTL_TRAFFIC_CONF: msgb_free(msg); break; + case L1CTL_GPRS_DL_BLOCK_IND: + rc = rx_l1_gprs_dl_block_ind(ms, msg); + break; default: LOGP(DL1C, LOGL_ERROR, "Unknown MSG: %u\n", hdr->msg_type); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I87950e893ef96ff8328f43f1548111aa9f66439b Gerrit-Change-Number: 31571 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

[S] Change in osmo-ggsn[master]: Bump version: 1.10.0.4-bf69 → 1.10.1

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 ) Change subject: Bump version: 1.10.0.4-bf69 → 1.10.1 ...................................................................... Bump version: 1.10.0.4-bf69 → 1.10.1 Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295 --- M debian/changelog 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index be0948e..281ec0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +osmo-ggsn (1.10.1) unstable; urgency=medium + + [ Oliver Smith ] + * debian/libgtp6.shlibs: new file + + [ Vadim Yanitskiy ] + * lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix} + * gtp/gsn.c: fix 'No newline at end of file' + * gtp: use OSMO_ASSERT() in gtp_new() + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Mon, 27 Feb 2023 22:35:47 +0700 + osmo-ggsn (1.10.0) unstable; urgency=medium [ Max ] -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295 Gerrit-Change-Number: 31570 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[S] Change in osmo-ggsn[master]: Bump version: 1.10.0.4-bf69 → 1.10.1

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 ) Change subject: Bump version: 1.10.0.4-bf69 → 1.10.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295 Gerrit-Change-Number: 31570 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 15:43:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in osmo-ggsn[master]: Bump version: 1.10.0.4-bf69 → 1.10.1

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 ) Change subject: Bump version: 1.10.0.4-bf69 → 1.10.1 ...................................................................... Bump version: 1.10.0.4-bf69 → 1.10.1 Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295 --- M debian/changelog 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/70/31570/1 diff --git a/debian/changelog b/debian/changelog index be0948e..281ec0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +osmo-ggsn (1.10.1) unstable; urgency=medium + + [ Oliver Smith ] + * debian/libgtp6.shlibs: new file + + [ Vadim Yanitskiy ] + * lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix} + * gtp/gsn.c: fix 'No newline at end of file' + * gtp: use OSMO_ASSERT() in gtp_new() + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Mon, 27 Feb 2023 22:35:47 +0700 + osmo-ggsn (1.10.0) unstable; urgency=medium [ Max ] -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295 Gerrit-Change-Number: 31570 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/RSL_Types: RSL_SpeechAlgo: support CSD

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 to look at the new patch set (#2). Change subject: library/RSL_Types: RSL_SpeechAlgo: support CSD ...................................................................... library/RSL_Types: RSL_SpeechAlgo: support CSD Add data rates from 3GPP TS 48.058 § 9.3.6 octet 6 to the enum, and rename it from RSL_SpeechAlgo to RSL_SpeechAlgoDataRate so it's clear that it contains both. Rename RSL_CMOD_SP_GSM3 to RSL_CMOD_SP_GSM3_DT_NT1 and RSL_CMOD_SP_GSM4 to RSL_CMOD_SP_GSM4_DT_NT8 because their values are shared between a speech and a data entry. Related: OS#4393 Change-Id: Ief2d95c7e9d71afb26fa74da755294226c8e158d --- M bsc/BSC_Tests.ttcn M bts/BTS_Tests.ttcn M bts/BTS_Tests_VAMOS.ttcn M bts/BTS_Tests_perf.ttcn M library/RSL_Types.ttcn 5 files changed, 71 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/31556/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 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: Ief2d95c7e9d71afb26fa74da755294226c8e158d Gerrit-Change-Number: 31556 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

[S] Change in libosmo-gprs[master]: tbf_dl: Fix state_fsm instance not freed

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31537 to look at the new patch set (#2). Change subject: tbf_dl: Fix state_fsm instance not freed ...................................................................... tbf_dl: Fix state_fsm instance not freed Change-Id: I2f89810dd346cee904dcff0b598e229bd5f84a9f --- M src/rlcmac/tbf_dl.c M tests/rlcmac/rlcmac_prim_test.err 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/37/31537/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2f89810dd346cee904dcff0b598e229bd5f84a9f Gerrit-Change-Number: 31537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

[S] Change in osmo-ggsn[rel-1.9.1]: Bump version: 1.9.0.1-921b → 1.9.1

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31561 ) Change subject: Bump version: 1.9.0.1-921b → 1.9.1 ...................................................................... Bump version: 1.9.0.1-921b → 1.9.1 Change-Id: Ibbf1b867c1784ad0d1834a87cab6e1e09eb71f63 --- M debian/changelog 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 08cfb0b..8b10af0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-ggsn (1.9.1) unstable; urgency=medium + + * lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix} + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Mon, 27 Feb 2023 22:14:59 +0700 + osmo-ggsn (1.9.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: rel-1.9.1 Gerrit-Change-Id: Ibbf1b867c1784ad0d1834a87cab6e1e09eb71f63 Gerrit-Change-Number: 31561 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[S] Change in osmo-ggsn[rel-1.9.1]: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31560 ) Change subject: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix} ...................................................................... lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix} Fix wrong field order in the big-endian variants. Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c (cherry picked from commit 99afe979efec7bf3bd0dbd2da2c00df71e5f474d) --- M lib/icmpv6.h 1 file changed, 18 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/lib/icmpv6.h b/lib/icmpv6.h index 4b4dc37..ee5ef29 100644 --- a/lib/icmpv6.h +++ b/lib/icmpv6.h @@ -44,10 +44,9 @@ uint8_t res:6, m:1, o:1; -#else - uint8_t m:1, - o:1, - res:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */ + uint8_t o:1, m:1, res:6; #endif uint16_t router_lifetime; uint32_t reachable_time; @@ -72,10 +71,9 @@ uint8_t res:6, a:1, l:1; -#else - uint8_t l:1, - a:1, - res:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */ + uint8_t l:1, a:1, res:6; #endif uint32_t valid_lifetime; uint32_t preferred_lifetime; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: rel-1.9.1 Gerrit-Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c Gerrit-Change-Number: 31560 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[S] Change in osmo-ggsn[rel-1.9.1]: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31560 ) Change subject: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: rel-1.9.1 Gerrit-Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c Gerrit-Change-Number: 31560 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: Mon, 27 Feb 2023 15:21:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023