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

Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30993 ) Change subject: layer23: Introduce netdev.{c,h} ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22 Gerrit-Change-Number: 30993 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 Jan 2023 19:22:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}

by pespin

Attention is currently required from: laforge, pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30993 ) Change subject: layer23: Introduce netdev.{c,h} ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22 Gerrit-Change-Number: 30993 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Use shift operand to define bitmask values

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31005 ) Change subject: layer23: Use shift operand to define bitmask values ...................................................................... layer23: Use shift operand to define bitmask values Change-Id: I22e2f543c077a4df4623c5e3bd44f8f068596baf --- M src/host/layer23/include/osmocom/bb/common/l23_app.h 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/host/layer23/include/osmocom/bb/common/l23_app.h b/src/host/layer23/include/osmocom/bb/common/l23_app.h index 3c07f70..46c3f44 100644 --- a/src/host/layer23/include/osmocom/bb/common/l23_app.h +++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h @@ -6,11 +6,11 @@ /* Options supported by the l23 app */ enum { - L23_OPT_SAP = 1, - L23_OPT_ARFCN = 2, - L23_OPT_TAP = 4, - L23_OPT_VTY = 8, - L23_OPT_DBG = 16, + L23_OPT_SAP = 1 << 0, + L23_OPT_ARFCN = 1 << 1, + L23_OPT_TAP = 1 << 2, + L23_OPT_VTY = 1 << 3, + L23_OPT_DBG = 1 << 4, }; extern void *l23_ctx; 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I22e2f543c077a4df4623c5e3bd44f8f068596baf Gerrit-Change-Number: 31005 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}

by Jenkins Builder

Attention is currently required from: pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30994 ) Change subject: layer23: Introduce tun.{c,h} ...................................................................... Patch Set 5: (19 comments) File src/host/layer23/include/osmocom/bb/common/tun.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/4a8afc1f_b93cc2fb PS5, Line 39: int (*cb_ind) (struct tun_t * tun, void *pack, unsigned len); "foo * bar" should be "foo *bar" Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/775cd2d5_6d44e762 PS5, Line 39: int (*cb_ind) (struct tun_t * tun, void *pack, unsigned len); Unnecessary space before function pointer arguments Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/71c7215a_b42beb30 PS5, Line 53: int (*cb_ind) (struct tun_t * tun, void *pack, "foo * bar" should be "foo *bar" Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/92199383_9fa808c1 PS5, Line 53: int (*cb_ind) (struct tun_t * tun, void *pack, Unnecessary space before function pointer arguments File src/host/layer23/src/common/tun.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/a6231ea6_20e15f84 PS5, Line 48: #elif defined (__FreeBSD__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/b3de3dea_39df748b PS5, Line 53: #elif defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/ed5fcd65_7ba99531 PS5, Line 65: #define SYS_ERR(sub, pri, en, fmt, args...) \ Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/d0672de6_06b7e72e PS5, Line 104: #if defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/f5b25576_d09e507d PS5, Line 123: #if defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/26a9409c_7e36fdf1 PS5, Line 186: #elif defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/471bf806_9355b96d PS5, Line 214: strcpy(ifr.ifr_name, dev_name); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/6e9eb573_37dc9c7b PS5, Line 221: strncpy((*tun)->devname, ifr.ifr_name, IFNAMSIZ); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/15f4d77d_fd68634f PS5, Line 229: } else { else is not generally useful after a break or return Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/b10b6205_a672c748 PS5, Line 230: strncpy((*tun)->devname, dev_name, IFNAMSIZ); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/4e9f57a6_07a540c4 PS5, Line 243: #elif defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/d1d4e1e9_601e7a14 PS5, Line 273: strncpy(areq.ifra_name, (*tun)->devname, IFNAMSIZ); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/3b156a88_b929cdb2 PS5, Line 283: while (ioctl(fd, SIOCDIFADDR, (void *)&areq) != -1) ; space prohibited before semicolon Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/7efece6a_597698a6 PS5, Line 319: int (*cb_ind) (struct tun_t * tun, void *pack, unsigned len)) "foo * bar" should be "foo *bar" Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822): https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/51cb1e57_8460edd6 PS5, Line 319: int (*cb_ind) (struct tun_t * tun, void *pack, unsigned len)) Unnecessary space before function pointer arguments -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd Gerrit-Change-Number: 30994 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 19:18:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-{llc,sndcp}

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31007 ) Change subject: modem: Initial integration of libosmo-gprs-{llc,sndcp} ...................................................................... Patch Set 1: (1 comment) File src/host/layer23/src/modem/sndcp.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2818): https://gerrit.osmocom.org/c/osmocom-bb/+/31007/comment/41db37a8_945be893 PS1, Line 196: } adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a Gerrit-Change-Number: 31007 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 17 Jan 2023 19:18:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Initial integration of tun device

by Jenkins Builder

Attention is currently required from: pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30996 ) Change subject: layer23: Initial integration of tun device ...................................................................... Patch Set 5: (1 comment) File src/host/layer23/src/modem/app_modem.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2816): https://gerrit.osmocom.org/c/osmocom-bb/+/30996/comment/1595b3f5_6b234642 PS5, Line 102: iph->version == 4 ? '4' : '6', osmo_sockaddr_ntop(&dst, addrstr), len); code indent should use tabs where possible -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d Gerrit-Change-Number: 30996 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 19:18:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}

by Jenkins Builder

Attention is currently required from: laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30993 ) Change subject: layer23: Introduce netdev.{c,h} ...................................................................... Patch Set 5: (42 comments) File src/host/layer23/include/osmocom/bb/common/netdev.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/a5dd17f5_d153a58d PS5, Line 33: { please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/c75e4485_212c1a94 PS5, Line 33: { open brace '{' following struct go on the same line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/d67c0539_72bba0dc PS5, Line 35: unsigned int ihl:4; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/de26b202_8c562839 PS5, Line 36: unsigned int version:4; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/1618f8e3_c652898f PS5, Line 38: unsigned int version:4; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/977e63f6_881052e3 PS5, Line 39: unsigned int ihl:4; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/266ab51b_84cf7837 PS5, Line 43: u_int8_t tos; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/03a8713e_083f24df PS5, Line 44: u_int16_t tot_len; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/c31b7302_94df4c8c PS5, Line 45: u_int16_t id; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/bd93e3fe_dda3b5eb PS5, Line 46: u_int16_t frag_off; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/bea2e2de_646a4495 PS5, Line 47: u_int8_t ttl; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/663f5f82_d98d66f7 PS5, Line 48: u_int8_t protocol; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/74dd9f87_9f7e275f PS5, Line 49: u_int16_t check; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/a546a4a7_605fda5f PS5, Line 50: u_int32_t saddr; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/9e7647ae_f32531f3 PS5, Line 51: u_int32_t daddr; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/e5a5b9ff_4962009c PS5, Line 53: }; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/f5df8216_d9151cd9 PS5, Line 57: struct osmo_sockaddr addr; please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/dd9f506f_76aa85dd PS5, Line 58: uint8_t prefixlen; please, no spaces at the start of a line File src/host/layer23/src/common/netdev.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/f93fe8ff_eb02a58f PS5, Line 45: #elif defined (__FreeBSD__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/a484a9e8_2543f66e PS5, Line 49: #elif defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/0f6b3aa3_c0551ad1 PS5, Line 61: #define SYS_ERR(sub, pri, en, fmt, args...) \ Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/e2e790e9_49f92066 PS5, Line 97: strncpy(ifr.ifr_name, devname, IFNAMSIZ); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/453e2e68_d8e879a1 PS5, Line 125: #elif defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/965d4086_9aedc3df PS5, Line 132: strncpy(ifr.ifr_name, devname, IFNAMSIZ); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/9b3ac1eb_381d55bd PS5, Line 160: if (ioctl(fd, SIOCSIFDSTADDR, (caddr_t) & ifr) < 0) { space prohibited after that '&' (ctx:WxW) Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/19f21466_dbf7ed0f PS5, Line 172: #elif defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/389eb214_0c504952 PS5, Line 191: #if defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/e7e98a04_c720f219 PS5, Line 213: #elif defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/80e654f6_023fd8db PS5, Line 214: strncpy(ifr.ifr_name, devname, IFNAMSIZ); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/d4112896_1505b17f PS5, Line 249: #elif defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/6a4495db_40353f81 PS5, Line 381: #elif defined (__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/8881eba5_88e0d9fe PS5, Line 381: #elif defined (__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/51d2c8fc_cf4740bd PS5, Line 387: strncpy(areq.ifra_name, devname, IFNAMSIZ); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/70f040f3_2c7e3267 PS5, Line 530: #elif defined (__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/6d7b8f50_34886f12 PS5, Line 530: #elif defined (__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/07727629_e01a7d41 PS5, Line 536: strncpy(areq.ifra_name, devname, IFNAMSIZ); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/f81e5036_785672ee PS5, Line 608: #elif defined(__FreeBSD__) || defined (__APPLE__) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/866e17c7_2c2d9b8c PS5, Line 677: strncpy(ifr.ifr_name, gw_iface, IFNAMSIZ); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/ed1a632f_6d6169fe PS5, Line 751: static const uint8_t ll_prefix[] = { 0xfe,0x80, 0,0, 0,0, 0,0 }; space required after that ',' (ctx:VxV) Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/efd78e01_3c0cd4c0 PS5, Line 751: static const uint8_t ll_prefix[] = { 0xfe,0x80, 0,0, 0,0, 0,0 }; space required after that ',' (ctx:VxV) Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/d3394eae_d8f289e8 PS5, Line 751: static const uint8_t ll_prefix[] = { 0xfe,0x80, 0,0, 0,0, 0,0 }; space required after that ',' (ctx:VxV) Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815): https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/e2d28ee6_61e08b63 PS5, Line 751: static const uint8_t ll_prefix[] = { 0xfe,0x80, 0,0, 0,0, 0,0 }; space required after that ',' (ctx:VxV) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22 Gerrit-Change-Number: 30993 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 Jan 2023 19:18:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-{llc,sndcp}

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31007 ) Change subject: modem: Initial integration of libosmo-gprs-{llc,sndcp} ...................................................................... modem: Initial integration of libosmo-gprs-{llc,sndcp} Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a --- M src/host/layer23/include/osmocom/bb/common/logging.h M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/modem/Makefile.am A src/host/layer23/include/osmocom/bb/modem/llc.h A src/host/layer23/include/osmocom/bb/modem/sndcp.h M src/host/layer23/src/common/logging.c M src/host/layer23/src/modem/Makefile.am M src/host/layer23/src/modem/app_modem.c A src/host/layer23/src/modem/llc.c A src/host/layer23/src/modem/sndcp.c 10 files changed, 436 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/07/31007/1 diff --git a/src/host/layer23/include/osmocom/bb/common/logging.h b/src/host/layer23/include/osmocom/bb/common/logging.h index 5259f35..912b7d4 100644 --- a/src/host/layer23/include/osmocom/bb/common/logging.h +++ b/src/host/layer23/include/osmocom/bb/common/logging.h @@ -27,6 +27,8 @@ DLUA, DGAPK, DTUN, + DLLC, + DSNDCP, }; extern const struct log_info log_info; diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 523ad8e..5e04894 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -183,6 +183,22 @@ struct gprs_settings { struct llist_head apn_list; + + /* RFC1144 TCP/IP header compression */ + struct { + int active; + int passive; + int s01; + } pcomp_rfc1144; + + /* V.42vis data compression */ + struct { + int active; + int passive; + int p0; + int p1; + int p2; + } dcomp_v42bis; }; int gprs_settings_init(struct osmocom_ms *ms); diff --git a/src/host/layer23/include/osmocom/bb/modem/Makefile.am b/src/host/layer23/include/osmocom/bb/modem/Makefile.am index 309a514..4a91c39 100644 --- a/src/host/layer23/include/osmocom/bb/modem/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/modem/Makefile.am @@ -1,4 +1,6 @@ noinst_HEADERS = \ modem.h \ + llc.h \ + sndcp.h \ vty.h \ $(NULL) diff --git a/src/host/layer23/include/osmocom/bb/modem/llc.h b/src/host/layer23/include/osmocom/bb/modem/llc.h new file mode 100644 index 0000000..5fe5d49 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/modem/llc.h @@ -0,0 +1,8 @@ +#pragma once + +#include <stdbool.h> + +struct osmocom_ms; + +int modem_llc_init(struct osmocom_ms *ms, const char *cipher_plugin_path); + diff --git a/src/host/layer23/include/osmocom/bb/modem/sndcp.h b/src/host/layer23/include/osmocom/bb/modem/sndcp.h new file mode 100644 index 0000000..b2e6f0f --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/modem/sndcp.h @@ -0,0 +1,10 @@ +#pragma once + +#include <stdbool.h> + +struct osmocom_ms; +struct osmobb_apn; + +int modem_sndcp_init(struct osmocom_ms *ms); +int modem_sndcp_sn_xid_req(struct osmobb_apn *apn); +int modem_sndcp_sn_unitdata_req(struct osmobb_apn *apn, uint8_t *npdu, size_t npdu_len); diff --git a/src/host/layer23/src/common/logging.c b/src/host/layer23/src/common/logging.c index 34c171f..66dc416 100644 --- a/src/host/layer23/src/common/logging.c +++ b/src/host/layer23/src/common/logging.c @@ -153,6 +153,18 @@ .color = "\033[0;37m", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DLLC] = { + .name = "DLLC", + .description = "GPRS Logical Link Control Protocol (LLC)", + .color = "\033[0;38m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, + [DSNDCP] = { + .name = "DSNDCP", + .description = "GPRS Sub-Network Dependent Control Protocol (SNDCP)", + .color = "\033[0;39m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, }; const struct log_info log_info = { diff --git a/src/host/layer23/src/modem/Makefile.am b/src/host/layer23/src/modem/Makefile.am index 4f369ad..e13ea2d 100644 --- a/src/host/layer23/src/modem/Makefile.am +++ b/src/host/layer23/src/modem/Makefile.am @@ -18,6 +18,8 @@ modem_SOURCES = \ $(top_srcdir)/src/common/main.c \ app_modem.c \ + llc.c \ + sndcp.c \ vty.c \ $(NULL) modem_LDADD = \ diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 7f563a1..780ad61 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -47,6 +47,8 @@ #include <osmocom/bb/common/sysinfo.h> #include <osmocom/bb/common/apn.h> #include <osmocom/bb/common/tun.h> +#include <osmocom/bb/modem/llc.h> +#include <osmocom/bb/modem/sndcp.h> #include <osmocom/bb/modem/vty.h> #include <l1ctl_proto.h> @@ -101,8 +103,8 @@ LOGPAPN(LOGL_DEBUG, apn, "system wants to transmit IPv%c pkt to %s (%u bytes)\n", iph->version == 4 ? '4' : '6', osmo_sockaddr_ntop(&dst, addrstr), len); - /* TODO: prepare & transmit SNDCP UNITDATA.req */ - return 0; + rc = modem_sndcp_sn_unitdata_req(apn, pack, len); + return rc; } /* Generate a 8-bit CHANNEL REQUEST message as per 3GPP TS 44.018, 9.1.8 */ @@ -532,6 +534,8 @@ int l23_app_init(void) { + int rc; + l23_app_start = _modem_start; log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); @@ -541,6 +545,16 @@ app_data.ms = osmocom_ms_alloc(l23_ctx, "1"); OSMO_ASSERT(app_data.ms); + if ((rc = modem_llc_init(app_data.ms, NULL))) { + LOGP(DLGLOBAL, LOGL_FATAL, "Failed initializing LLC layer\n"); + return rc; + } + + if ((rc = modem_sndcp_init(app_data.ms))) { + LOGP(DLGLOBAL, LOGL_FATAL, "Failed initializing SNDCP layer\n"); + return rc; + } + osmo_signal_register_handler(SS_L1CTL, &signal_cb, NULL); lapdm_channel_set_l3(&app_data.ms->lapdm_channel, &modem_rslms_cb, app_data.ms); return 0; diff --git a/src/host/layer23/src/modem/llc.c b/src/host/layer23/src/modem/llc.c new file mode 100644 index 0000000..adf945b --- /dev/null +++ b/src/host/layer23/src/modem/llc.c @@ -0,0 +1,172 @@ +/* GPRS LLC protocol implementation as per 3GPP TS 04.64 */ +/* (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include <errno.h> +#include <stdint.h> +#include <stdbool.h> +#include <inttypes.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/crypt/kdf.h> +#include <osmocom/gprs/gprs_bssgp.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/sndcp/sndcp_prim.h> + +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/apn.h> +#include <osmocom/bb/common/ms.h> +#include <osmocom/bb/common/tun.h> +#include <osmocom/bb/modem/llc.h> + +LLIST_HEAD(sgsn_llmes); + +static int sgsn_llc_handle_ll_gmm(struct osmo_gprs_llc_prim *llc_prim) +{ + struct msgb *msg; + + switch (llc_prim->oph.primitive) { + case OSMO_GPRS_LLC_LL_UNITDATA: + break; + case OSMO_GPRS_LLC_LL_RESET: + case OSMO_GPRS_LLC_LL_ESTABLISH: + case OSMO_GPRS_LLC_LL_XID: + case OSMO_GPRS_LLC_LL_DATA: + case OSMO_GPRS_LLC_LL_STATUS: + default: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unexpected Rx LL prim %u\n", + __func__, llc_prim->oph.primitive); + return -EINVAL; + } + + msg = msgb_alloc(4096, "gsm0408_rx"); + msgb_tlli(msg) = llc_prim->ll.tlli; + msgb_gmmh(msg) = msgb_put(msg, llc_prim->ll.l3_pdu_len); + if (llc_prim->ll.l3_pdu_len > 0) { + memcpy(msgb_gmmh(msg), llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len); + } + //TODO: submit to GMM? + //TODO: free msg? + return 0; +} + +static int sgsn_llc_handle_ll_sndcp(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + switch (llc_prim->oph.primitive) { + case OSMO_GPRS_LLC_LL_RESET: + case OSMO_GPRS_LLC_LL_ESTABLISH: + case OSMO_GPRS_LLC_LL_XID: + case OSMO_GPRS_LLC_LL_DATA: + case OSMO_GPRS_LLC_LL_UNITDATA: + case OSMO_GPRS_LLC_LL_STATUS: + /* Forward it to upper layers, pass owneserip over to SNDCP: */ + osmo_gprs_sndcp_prim_lower_up(llc_prim); + rc = 1; /* Tell LLC that we take ownership of the prim. */ + break; + default: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unexpected Rx LL prim %u\n", + __func__, llc_prim->oph.primitive); + rc = -EINVAL; + } + return rc; +} + +int sgsn_llc_prim_up_cb(struct osmo_gprs_llc_prim *llc_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); + int rc = 0; + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_LLGM: + LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s TLLI=0x%08x\n", + __func__, pdu_name, llc_prim->llgmm.tlli); + break; + case OSMO_GPRS_LLC_SAP_LL: + LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s TLLI=0x%08x SAPI=%s l3=[%s]\n", + __func__, pdu_name, llc_prim->ll.tlli, + osmo_gprs_llc_sapi_name(llc_prim->ll.sapi), + osmo_hexdump(llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len)); + + switch (llc_prim->ll.sapi) { + case OSMO_GPRS_LLC_SAPI_GMM: + rc = sgsn_llc_handle_ll_gmm(llc_prim); + break; + case OSMO_GPRS_LLC_SAPI_SNDCP3: + case OSMO_GPRS_LLC_SAPI_SNDCP5: + case OSMO_GPRS_LLC_SAPI_SNDCP9: + case OSMO_GPRS_LLC_SAPI_SNDCP11: + rc = sgsn_llc_handle_ll_sndcp(llc_prim); + break; + case OSMO_GPRS_LLC_SAPI_TOM2: + case OSMO_GPRS_LLC_SAPI_SMS: + case OSMO_GPRS_LLC_SAPI_TOM8: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unimplemented Rx llc_sapi %s\n", __func__, pdu_name); + rc = -EINVAL; + break; + default: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unexpected Rx llc_sapi %s\n", __func__, pdu_name); + rc = -EINVAL; + break; + } + break; + default: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return rc; +} + +int sgsn_llc_prim_down_cb(struct osmo_gprs_llc_prim *llc_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); + int rc = 0; + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_GRR: + LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s l3=[%s]\n", __func__, pdu_name, + osmo_hexdump(llc_prim->grr.ll_pdu, llc_prim->grr.ll_pdu_len)); + OSMO_ASSERT(0); + break; + default: + LOGP(DLLC, LOGL_DEBUG, "%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return rc; +} + +int modem_llc_init(struct osmocom_ms *ms, const char *cipher_plugin_path) +{ + int rc; + rc = osmo_gprs_llc_init(OSMO_GPRS_LLC_LOCATION_MS, cipher_plugin_path); + if (rc != 0) + return rc; + + osmo_gprs_llc_set_log_cat(OSMO_GPRS_LLC_LOGC_LLC, DLLC); + + osmo_gprs_llc_prim_set_up_cb(sgsn_llc_prim_up_cb, ms); + osmo_gprs_llc_prim_set_down_cb(sgsn_llc_prim_down_cb, ms); + return rc; +} diff --git a/src/host/layer23/src/modem/sndcp.c b/src/host/layer23/src/modem/sndcp.c new file mode 100644 index 0000000..673aad8 --- /dev/null +++ b/src/host/layer23/src/modem/sndcp.c @@ -0,0 +1,196 @@ +/* GPRS SNDCP User/SN/SNSM interfaces as per 3GPP TS 04.65 */ +/* (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include <stdbool.h> +#include <stdint.h> +#include <errno.h> +#include <stdio.h> + +#include <netinet/ip.h> +#include <netinet/ip6.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/endian.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/sndcp/sndcp_prim.h> +#include <osmocom/gprs/sndcp/sndcp.h> + +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/apn.h> +#include <osmocom/bb/common/ms.h> +#include <osmocom/bb/common/tun.h> +#include <osmocom/bb/modem/sndcp.h> + +/* Received SN-XID.cnf from SNDCP layer: */ +static int modem_sndcp_handle_sn_xid_cnf(struct osmobb_apn *apn, struct osmo_gprs_sndcp_prim *sndcp_prim) +{ + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx SN-XID.cnf: TODO IMPLEMENT!\n", __func__); + return 0; +} + +/* Received SN-UNITDTA.ind from SNDCP layer: */ +static int modem_sndcp_handle_sn_unitdata_ind(struct osmobb_apn *apn, struct osmo_gprs_sndcp_prim *sndcp_prim) +{ + const char *npdu_name = osmo_gprs_sndcp_prim_name(sndcp_prim); + int rc; + + LOGP(DSNDCP, LOGL_DEBUG, "Rx %s TLLI=0x%08x SAPI=%s NSAPI=%u NPDU=[%s]\n", + npdu_name, + sndcp_prim->sn.tlli, osmo_gprs_llc_sapi_name(sndcp_prim->sn.sapi), + sndcp_prim->sn.data_req.nsapi, + osmo_hexdump(sndcp_prim->sn.data_ind.npdu, sndcp_prim->sn.data_ind.npdu_len)); + + rc = tun_encaps(apn->tun.tun, sndcp_prim->sn.data_ind.npdu, sndcp_prim->sn.data_ind.npdu_len); + return rc; +} + +static int modem_sndcp_prim_up_cb(struct osmo_gprs_sndcp_prim *sndcp_prim, void *user_data) +{ + struct osmocom_ms *ms = user_data; + struct osmobb_apn *apn; + const char *npdu_name = osmo_gprs_sndcp_prim_name(sndcp_prim); + int rc = 0; + + if (sndcp_prim->oph.sap != OSMO_GPRS_SNDCP_SAP_SN) { + LOGP(DSNDCP, LOGL_ERROR, "%s(): Unexpected Rx %s\n", __func__, npdu_name); + OSMO_ASSERT(0); + } + + /* TODO: properly retrieve APN/PDP based on TLLI/SAPI/NSAPI: */ + apn = llist_first_entry_or_null(&ms->gprs.apn_list, struct osmobb_apn, list); + if (!apn) { + LOGP(DSNDCP, LOGL_NOTICE, "Unable to find destination APN: Rx %s\n", npdu_name); + return -ENODEV; + } + + switch (OSMO_PRIM_HDR(&sndcp_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_SNDCP_SN_UNITDATA, PRIM_OP_INDICATION): + rc = modem_sndcp_handle_sn_unitdata_ind(apn, sndcp_prim); + break; + case OSMO_PRIM(OSMO_GPRS_SNDCP_SN_XID, PRIM_OP_CONFIRM): + rc = modem_sndcp_handle_sn_xid_cnf(apn, sndcp_prim); + break; + default: + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx %s UNIMPLEMENTED\n", __func__, npdu_name); + break; + }; + return rc; +} + +static int modem_sndcp_prim_down_cb(struct osmo_gprs_llc_prim *llc_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); + int rc = 0; + + if (llc_prim->oph.sap != OSMO_GPRS_LLC_SAP_LL) { + LOGP(DSNDCP, LOGL_ERROR, "%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + + switch (OSMO_PRIM_HDR(&llc_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_LLC_LL_UNITDATA, PRIM_OP_REQUEST): + LOGP(DSNDCP, LOGL_DEBUG, "%s(): Rx %s TLLI=0x%08x SAPI=%s L3=[%s]\n", + __func__, pdu_name, + llc_prim->ll.tlli, osmo_gprs_llc_sapi_name(llc_prim->ll.sapi), + osmo_hexdump(llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len)); + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + rc = 1; /* Tell SNDCP layer we took msgb ownsership and transfer it to LLC */ + break; + default: + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx %s UNIMPLEMENTED\n", __func__, pdu_name); + break; + }; + return rc; +} + +static int modem_sndcp_prim_snsm_cb(struct osmo_gprs_sndcp_prim *sndcp_prim, void *user_data) +{ + const char *npdu_name = osmo_gprs_sndcp_prim_name(sndcp_prim); + + if (sndcp_prim->oph.sap != OSMO_GPRS_SNDCP_SAP_SNSM) { + LOGP(DSNDCP, LOGL_ERROR, "%s(): Unexpected Rx %s\n", __func__, npdu_name); + OSMO_ASSERT(0); + } + + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx %s UNIMPLEMENTED\n", __func__, npdu_name); + return 0; +} + + +int modem_sndcp_init(struct osmocom_ms *ms) +{ + int rc; + rc = osmo_gprs_sndcp_init(); + if (rc != 0) + return rc; + + osmo_gprs_sndcp_set_log_cat(OSMO_GPRS_SNDCP_LOGC_SNDCP, DSNDCP); + osmo_gprs_sndcp_set_log_cat(OSMO_GPRS_SNDCP_LOGC_SLHC, DSNDCP); + + osmo_gprs_sndcp_prim_set_up_cb(modem_sndcp_prim_up_cb, ms); + osmo_gprs_sndcp_prim_set_down_cb(modem_sndcp_prim_down_cb, ms); + osmo_gprs_sndcp_prim_set_snsm_cb(modem_sndcp_prim_snsm_cb, ms); + return rc; +} + +int modem_sndcp_sn_xid_req(struct osmobb_apn *apn) +{ + struct osmo_gprs_sndcp_prim *sndcp_prim; + int rc; + struct osmocom_ms *ms = apn->ms; + struct gprs_settings *set = &ms->gprs; + + /* TODO: look up PDP context IDs from ms once we have GMM layer. */ + uint32_t tlli = 0xe1c5d364; + uint8_t sapi = OSMO_GPRS_LLC_SAPI_SNDCP3; + uint8_t nsapi = 1; + + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_xid_req(tlli, sapi, nsapi); + OSMO_ASSERT(sndcp_prim); + sndcp_prim->sn.xid_req.pcomp_rfc1144.active = set->pcomp_rfc1144.active; + sndcp_prim->sn.xid_req.pcomp_rfc1144.s01 = set->pcomp_rfc1144.s01; + sndcp_prim->sn.xid_req.dcomp_v42bis.active = set->dcomp_v42bis.active; + sndcp_prim->sn.xid_req.dcomp_v42bis.p0 = set->dcomp_v42bis.p0; + sndcp_prim->sn.xid_req.dcomp_v42bis.p1 = set->dcomp_v42bis.p1; + sndcp_prim->sn.xid_req.dcomp_v42bis.p2 = set->dcomp_v42bis.p2; + rc = osmo_gprs_sndcp_prim_upper_down(sndcp_prim); + return rc; +} + +int modem_sndcp_sn_unitdata_req(struct osmobb_apn *apn, uint8_t *npdu, size_t npdu_len) +{ + struct osmo_gprs_sndcp_prim *sndcp_prim; + int rc; + + /* TODO: look up PDP context IDs from apn->ms once we have GMM layer. */ + uint32_t tlli = 0xe1c5d364; + uint8_t sapi = OSMO_GPRS_LLC_SAPI_SNDCP3; + uint8_t nsapi = 1; + + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_unitdata_req(tlli, sapi, nsapi, npdu, npdu_len); + OSMO_ASSERT(sndcp_prim); + rc = osmo_gprs_sndcp_prim_upper_down(sndcp_prim); + return rc; +} \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a Gerrit-Change-Number: 31007 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: main: Log line about using config file before parsing it

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31006 ) Change subject: layer23: main: Log line about using config file before parsing it ...................................................................... layer23: main: Log line about using config file before parsing it Change-Id: I66b5b18887b8deb37c3784fec90644470498d7b5 --- M src/host/layer23/src/common/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/06/31006/1 diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 2cdf5d4..82bbc60 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -231,6 +231,7 @@ if (app->vty_init) app->vty_init(); if (config_file) { + LOGP(DLGLOBAL, LOGL_INFO, "Using configuration from '%s'\n", config_file); l23_vty_reading = true; rc = vty_read_config_file(config_file, NULL); l23_vty_reading = false; @@ -239,7 +240,6 @@ "Failed to parse the configuration file '%s'\n", config_file); return rc; } - LOGP(DLGLOBAL, LOGL_INFO, "Using configuration from '%s'\n", config_file); } rc = telnet_init_default(l23_ctx, NULL, OSMO_VTY_PORT_BB); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I66b5b18887b8deb37c3784fec90644470498d7b5 Gerrit-Change-Number: 31006 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Initial integration of tun device

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 to look at the new patch set (#5). Change subject: layer23: Initial integration of tun device ...................................................................... layer23: Initial integration of tun device Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d --- M src/host/layer23/include/osmocom/bb/common/apn.h M src/host/layer23/include/osmocom/bb/common/l23_app.h M src/host/layer23/src/common/apn.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/modem/app_modem.c 5 files changed, 109 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/96/30996/5 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d Gerrit-Change-Number: 30996 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023