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

Change in libosmo-gprs[master]: llc: add -export-symbols-regex '^osmo_' to CFLAGS

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29401 ) Change subject: llc: add -export-symbols-regex '^osmo_' to CFLAGS ...................................................................... llc: add -export-symbols-regex '^osmo_' to CFLAGS Change-Id: I7fac3ef730ea4b2719002dd61289b22c424f43f4 --- M src/llc/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/01/29401/1 diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index 5dc2060..e24a3b3 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -26,8 +26,8 @@ llc_pdu.c \ $(NULL) -# TODO: -export-symbols-regex '^osmo_' libosmo_gprs_llc_la_LDFLAGS = \ + -export-symbols-regex '^osmo_' \ -version-info $(LIBVERSION) \ -no-undefined \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7fac3ef730ea4b2719002dd61289b22c424f43f4 Gerrit-Change-Number: 29401 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: import FCS (CRC24) calculation API from osmo-sgsn.git

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29400 ) Change subject: llc: import FCS (CRC24) calculation API from osmo-sgsn.git ...................................................................... llc: import FCS (CRC24) calculation API from osmo-sgsn.git osmo-sgsn.git fb6cf3221ef4989441c09a650011e4a334c37d12 Changes made: * Add 'osmo_' prefix to gprs_llc_fcs(), * osmo_gprs_llc_fcs() takes size_t and returns uint32_t, * crc24_calc() takes size_t. Change-Id: Ib4465c289d9ef2a1b8ef5730c559bc799bb1f012 --- M include/osmocom/gprs/llc/llc.h M src/llc/Makefile.am A src/llc/crc24.c M src/llc/llc_pdu.c 4 files changed, 83 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/00/29400/1 diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 3afaf3b..92a0045 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -3,6 +3,7 @@ /* LLC (Logical Link Control) definitions from 3GPP TS 44.064 */ #include <stdint.h> +#include <stddef.h> /* Section 6.2.3 Service Access Point Identifier (SAPI) */ enum osmo_gprs_llc_sapi { @@ -128,3 +129,5 @@ uint16_t kD; uint16_t kU; }; + +uint32_t osmo_gprs_llc_fcs(const uint8_t *data, size_t len); diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index 5a4ad72..5dc2060 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -22,6 +22,7 @@ $(NULL) libosmo_gprs_llc_la_SOURCES = \ + crc24.c \ llc_pdu.c \ $(NULL) diff --git a/src/llc/crc24.c b/src/llc/crc24.c new file mode 100644 index 0000000..48be08a --- /dev/null +++ b/src/llc/crc24.c @@ -0,0 +1,66 @@ +/* GPRS LLC CRC-24 Implementation */ + +/* (C) 2008-2009 by Harald Welte <laforge(a)gnumonks.org> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <stddef.h> + +/* CRC24 table - FCS */ +static const uint32_t tbl_crc24[256] = { + 0x00000000, 0x00d6a776, 0x00f64557, 0x0020e221, 0x00b78115, 0x00612663, 0x0041c442, 0x00976334, + 0x00340991, 0x00e2aee7, 0x00c24cc6, 0x0014ebb0, 0x00838884, 0x00552ff2, 0x0075cdd3, 0x00a36aa5, + 0x00681322, 0x00beb454, 0x009e5675, 0x0048f103, 0x00df9237, 0x00093541, 0x0029d760, 0x00ff7016, + 0x005c1ab3, 0x008abdc5, 0x00aa5fe4, 0x007cf892, 0x00eb9ba6, 0x003d3cd0, 0x001ddef1, 0x00cb7987, + 0x00d02644, 0x00068132, 0x00266313, 0x00f0c465, 0x0067a751, 0x00b10027, 0x0091e206, 0x00474570, + 0x00e42fd5, 0x003288a3, 0x00126a82, 0x00c4cdf4, 0x0053aec0, 0x008509b6, 0x00a5eb97, 0x00734ce1, + 0x00b83566, 0x006e9210, 0x004e7031, 0x0098d747, 0x000fb473, 0x00d91305, 0x00f9f124, 0x002f5652, + 0x008c3cf7, 0x005a9b81, 0x007a79a0, 0x00acded6, 0x003bbde2, 0x00ed1a94, 0x00cdf8b5, 0x001b5fc3, + 0x00fb4733, 0x002de045, 0x000d0264, 0x00dba512, 0x004cc626, 0x009a6150, 0x00ba8371, 0x006c2407, + 0x00cf4ea2, 0x0019e9d4, 0x00390bf5, 0x00efac83, 0x0078cfb7, 0x00ae68c1, 0x008e8ae0, 0x00582d96, + 0x00935411, 0x0045f367, 0x00651146, 0x00b3b630, 0x0024d504, 0x00f27272, 0x00d29053, 0x00043725, + 0x00a75d80, 0x0071faf6, 0x005118d7, 0x0087bfa1, 0x0010dc95, 0x00c67be3, 0x00e699c2, 0x00303eb4, + 0x002b6177, 0x00fdc601, 0x00dd2420, 0x000b8356, 0x009ce062, 0x004a4714, 0x006aa535, 0x00bc0243, + 0x001f68e6, 0x00c9cf90, 0x00e92db1, 0x003f8ac7, 0x00a8e9f3, 0x007e4e85, 0x005eaca4, 0x00880bd2, + 0x00437255, 0x0095d523, 0x00b53702, 0x00639074, 0x00f4f340, 0x00225436, 0x0002b617, 0x00d41161, + 0x00777bc4, 0x00a1dcb2, 0x00813e93, 0x005799e5, 0x00c0fad1, 0x00165da7, 0x0036bf86, 0x00e018f0, + 0x00ad85dd, 0x007b22ab, 0x005bc08a, 0x008d67fc, 0x001a04c8, 0x00cca3be, 0x00ec419f, 0x003ae6e9, + 0x00998c4c, 0x004f2b3a, 0x006fc91b, 0x00b96e6d, 0x002e0d59, 0x00f8aa2f, 0x00d8480e, 0x000eef78, + 0x00c596ff, 0x00133189, 0x0033d3a8, 0x00e574de, 0x007217ea, 0x00a4b09c, 0x008452bd, 0x0052f5cb, + 0x00f19f6e, 0x00273818, 0x0007da39, 0x00d17d4f, 0x00461e7b, 0x0090b90d, 0x00b05b2c, 0x0066fc5a, + 0x007da399, 0x00ab04ef, 0x008be6ce, 0x005d41b8, 0x00ca228c, 0x001c85fa, 0x003c67db, 0x00eac0ad, + 0x0049aa08, 0x009f0d7e, 0x00bfef5f, 0x00694829, 0x00fe2b1d, 0x00288c6b, 0x00086e4a, 0x00dec93c, + 0x0015b0bb, 0x00c317cd, 0x00e3f5ec, 0x0035529a, 0x00a231ae, 0x007496d8, 0x005474f9, 0x0082d38f, + 0x0021b92a, 0x00f71e5c, 0x00d7fc7d, 0x00015b0b, 0x0096383f, 0x00409f49, 0x00607d68, 0x00b6da1e, + 0x0056c2ee, 0x00806598, 0x00a087b9, 0x007620cf, 0x00e143fb, 0x0037e48d, 0x001706ac, 0x00c1a1da, + 0x0062cb7f, 0x00b46c09, 0x00948e28, 0x0042295e, 0x00d54a6a, 0x0003ed1c, 0x00230f3d, 0x00f5a84b, + 0x003ed1cc, 0x00e876ba, 0x00c8949b, 0x001e33ed, 0x008950d9, 0x005ff7af, 0x007f158e, 0x00a9b2f8, + 0x000ad85d, 0x00dc7f2b, 0x00fc9d0a, 0x002a3a7c, 0x00bd5948, 0x006bfe3e, 0x004b1c1f, 0x009dbb69, + 0x0086e4aa, 0x005043dc, 0x0070a1fd, 0x00a6068b, 0x003165bf, 0x00e7c2c9, 0x00c720e8, 0x0011879e, + 0x00b2ed3b, 0x00644a4d, 0x0044a86c, 0x00920f1a, 0x00056c2e, 0x00d3cb58, 0x00f32979, 0x00258e0f, + 0x00eef788, 0x003850fe, 0x0018b2df, 0x00ce15a9, 0x0059769d, 0x008fd1eb, 0x00af33ca, 0x007994bc, + 0x00dafe19, 0x000c596f, 0x002cbb4e, 0x00fa1c38, 0x006d7f0c, 0x00bbd87a, 0x009b3a5b, 0x004d9d2d +}; + +uint32_t crc24_calc(uint32_t fcs, const uint8_t *data, size_t len) +{ + while (len--) + fcs = (fcs >> 8) ^ tbl_crc24[(fcs ^ *data++) & 0xff]; + return fcs; +} diff --git a/src/llc/llc_pdu.c b/src/llc/llc_pdu.c index 0a98416..0a936a8 100644 --- a/src/llc/llc_pdu.c +++ b/src/llc/llc_pdu.c @@ -51,3 +51,16 @@ { OSMO_GPRS_LLC_FUNC_RNR, "RNR" }, { 0, NULL } }; + +uint32_t crc24_calc(uint32_t fcs, const uint8_t *data, size_t len); + +uint32_t osmo_gprs_llc_fcs(const uint8_t *data, size_t len) +{ + uint32_t fcs_calc; + + fcs_calc = crc24_calc(0xffffff, data, len); + fcs_calc = ~fcs_calc; + fcs_calc &= 0xffffff; + + return fcs_calc; +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ib4465c289d9ef2a1b8ef5730c559bc799bb1f012 Gerrit-Change-Number: 29400 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: enum osmo_gprs_llc_primitive: drop Req/Ind/Rsp/Cnf

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29396 ) Change subject: llc: enum osmo_gprs_llc_primitive: drop Req/Ind/Rsp/Cnf ...................................................................... llc: enum osmo_gprs_llc_primitive: drop Req/Ind/Rsp/Cnf The libosmocore's prim API offers 'enum osmo_prim_operation', which contains all required primitive operations: Req/Ind/Rsp/Cnf. Having LLC primitive types discriminated by operation is redundant. Change-Id: Ifa7512d0f6c7d3577358fd1449707315ba55894d --- M include/osmocom/gprs/llc/llc.h 1 file changed, 14 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/96/29396/1 diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index c568eac..43cc477 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -37,33 +37,21 @@ /* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ enum osmo_gprs_llc_primitive { /* GMM <-> LLME */ - OSMO_GPRS_LLC_LLGMM_ASSIGN_REQ, /* GMM tells us new TLLI: TLLI old, TLLI new, Kc, CiphAlg */ - OSMO_GPRS_LLC_LLGMM_RESET_REQ, /* GMM tells us to perform XID negotiation: TLLI */ - OSMO_GPRS_LLC_LLGMM_RESET_CNF, /* LLC informs GMM that XID has completed: TLLI */ - OSMO_GPRS_LLC_LLGMM_SUSPEND_REQ, /* GMM tells us MS has suspended: TLLI, Page */ - OSMO_GPRS_LLC_LLGMM_RESUME_REQ, /* GMM tells us MS has resumed: TLLI */ - OSMO_GPRS_LLC_LLGMM_PAGE_IND, /* LLC asks GMM to page MS: TLLI */ - OSMO_GPRS_LLC_LLGMM_IOV_REQ, /* GMM tells us to perform XID: TLLI */ - OSMO_GPRS_LLC_LLGMM_STATUS_IND, /* LLC informs GMM about error: TLLI, Cause */ + OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ + OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ + OSMO_GPRS_LLC_LLGMM_SUSPEND, /* Req: TLLI, Page */ + OSMO_GPRS_LLC_LLGMM_RESUME, /* Req: TLLI */ + OSMO_GPRS_LLC_LLGMM_PAGE, /* Ind: TLLI */ + OSMO_GPRS_LLC_LLGMM_IOV, /* Req: TLLI */ + OSMO_GPRS_LLC_LLGMM_STATUS, /* Ind: TLLI, Cause */ /* LLE <-> (GMM/SNDCP/SMS/TOM) */ - OSMO_GPRS_LLC_LL_RESET_IND, /* TLLI */ - OSMO_GPRS_LLC_LL_ESTABLISH_REQ, /* TLLI, XID Req */ - OSMO_GPRS_LLC_LL_ESTABLISH_IND, /* TLLI, XID Req, N201-I, N201-U */ - OSMO_GPRS_LLC_LL_ESTABLISH_RESP, /* TLLI, XID Negotiated */ - OSMO_GPRS_LLC_LL_ESTABLISH_CONF, /* TLLI, XID Neg, N201-i, N201-U */ - OSMO_GPRS_LLC_LL_RELEASE_REQ, /* TLLI, Local */ - OSMO_GPRS_LLC_LL_RELEASE_IND, /* TLLI, Cause */ - OSMO_GPRS_LLC_LL_RELEASE_CONF, /* TLLI */ - OSMO_GPRS_LLC_LL_XID_REQ, /* TLLI, XID Requested */ - OSMO_GPRS_LLC_LL_XID_IND, /* TLLI, XID Req, N201-I, N201-U */ - OSMO_GPRS_LLC_LL_XID_RESP, /* TLLI, XID Negotiated */ - OSMO_GPRS_LLC_LL_XID_CONF, /* TLLI, XID Neg, N201-I, N201-U */ - OSMO_GPRS_LLC_LL_DATA_REQ, /* TLLI, SN-PDU, Ref, QoS, Radio Prio, Ciph */ - OSMO_GPRS_LLC_LL_DATA_IND, /* TLLI, SN-PDU */ - OSMO_GPRS_LLC_LL_DATA_CONF, /* TLLI, Ref */ - OSMO_GPRS_LLC_LL_UNITDATA_REQ, /* TLLI, SN-PDU, Ref, QoS, Radio Prio, Ciph */ - OSMO_GPRS_LLC_LL_UNITDATA_IND, /* TLLI, SN-PDU */ - OSMO_GPRS_LLC_LL_STATUS_IND, /* TLLI, Cause */ + OSMO_GPRS_LLC_LL_RESET, /* Ind: TLLI */ + OSMO_GPRS_LLC_LL_ESTABLISH, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_RELEASE, /* Req/Ind/Cnf: TLLI, Local, Cause */ + OSMO_GPRS_LLC_LL_XID, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ + OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ + OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ }; /* Section 4.5.2 Logical Link States + Annex C.2 */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ifa7512d0f6c7d3577358fd1449707315ba55894d Gerrit-Change-Number: 29396 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add missing LLGMM primitive types

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29397 ) Change subject: llc: add missing LLGMM primitive types ...................................................................... llc: add missing LLGMM primitive types From 3GPP TS 44.064 version 16.0.0 (2020-08) Release 16. Change-Id: I85d3403f26ed1d80453affb7e01803402ccd7937 --- M include/osmocom/gprs/llc/llc.h 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/97/29397/1 diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 43cc477..657d176 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -39,11 +39,14 @@ /* GMM <-> LLME */ OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ + OSMO_GPRS_LLC_LLGMM_TRIGGER, /* Req: TLLI, Cause */ OSMO_GPRS_LLC_LLGMM_SUSPEND, /* Req: TLLI, Page */ OSMO_GPRS_LLC_LLGMM_RESUME, /* Req: TLLI */ OSMO_GPRS_LLC_LLGMM_PAGE, /* Ind: TLLI */ OSMO_GPRS_LLC_LLGMM_IOV, /* Req: TLLI */ OSMO_GPRS_LLC_LLGMM_STATUS, /* Ind: TLLI, Cause */ + OSMO_GPRS_LLC_LLGMM_PSHO, /* Req/Ind/Cnf: TLLI, Ciph, IOV-UI, Old XID */ + OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, /* Req: TLLI */ /* LLE <-> (GMM/SNDCP/SMS/TOM) */ OSMO_GPRS_LLC_LL_RESET, /* Ind: TLLI */ OSMO_GPRS_LLC_LL_ESTABLISH, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I85d3403f26ed1d80453affb7e01803402ccd7937 Gerrit-Change-Number: 29397 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add missing LLE <-> (RLC/MAC,BSSGP) primitives

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29398 ) Change subject: llc: add missing LLE <-> (RLC/MAC,BSSGP) primitives ...................................................................... llc: add missing LLE <-> (RLC/MAC,BSSGP) primitives 3GPP TS 44.064, section 7.1.2, Table 7: "LLC layer service primitives". Change-Id: I10bb63220585424584185ce2bde2d9f8fd0d8342 --- M include/osmocom/gprs/llc/llc.h 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/98/29398/1 diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 657d176..71b0aed 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -55,6 +55,11 @@ OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ + /* LLE <-> RLC/MAC (MS side) */ + OSMO_GPRS_LLC_GRR_DATA, /* Req/Ind: TLLI, LL-PDU, SAPI, Cause, QoS, Radio Prio */ + OSMO_GPRS_LLC_GRR_UNITDATA, /* Req/Ind: TLLI, LL-PDU, SAPI, QoS, Radio Prio */ + /* LLE <-> BSSGP (SGSN side) */ + OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ }; /* Section 4.5.2 Logical Link States + Annex C.2 */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I10bb63220585424584185ce2bde2d9f8fd0d8342 Gerrit-Change-Number: 29398 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: ensure all symbols have 'osmo_gprs_llc_' prefix

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29394 ) Change subject: llc: ensure all symbols have 'osmo_gprs_llc_' prefix ...................................................................... llc: ensure all symbols have 'osmo_gprs_llc_' prefix Change-Id: I569d8023d701bd14ee78baa9394b6983d9cafca8 --- M include/osmocom/gprs/llc/llc.h 1 file changed, 62 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/94/29394/1 diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 064df58..1dc3cc7 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -5,85 +5,85 @@ #include <stdint.h> /* Section 4.7 LLC Layer Structure */ -enum gprs_llc_sapi { - GPRS_SAPI_GMM = 1, - GPRS_SAPI_TOM2 = 2, - GPRS_SAPI_SNDCP3 = 3, - GPRS_SAPI_SNDCP5 = 5, - GPRS_SAPI_SMS = 7, - GPRS_SAPI_TOM8 = 8, - GPRS_SAPI_SNDCP9 = 9, - GPRS_SAPI_SNDCP11 = 11, +enum osmo_gprs_llc_sapi { + OSMO_GPRS_LLC_SAPI_GMM = 1, + OSMO_GPRS_LLC_SAPI_TOM2 = 2, + OSMO_GPRS_LLC_SAPI_SNDCP3 = 3, + OSMO_GPRS_LLC_SAPI_SNDCP5 = 5, + OSMO_GPRS_LLC_SAPI_SMS = 7, + OSMO_GPRS_LLC_SAPI_TOM8 = 8, + OSMO_GPRS_LLC_SAPI_SNDCP9 = 9, + OSMO_GPRS_LLC_SAPI_SNDCP12 = 11, }; /* Section 6.4.1.6 / Table 6 */ -enum gprs_llc_xid_type { - GPRS_LLC_XID_T_VERSION = 0, - GPRS_LLC_XID_T_IOV_UI = 1, - GPRS_LLC_XID_T_IOV_I = 2, - GPRS_LLC_XID_T_T200 = 3, - GPRS_LLC_XID_T_N200 = 4, - GPRS_LLC_XID_T_N201_U = 5, - GPRS_LLC_XID_T_N201_I = 6, - GPRS_LLC_XID_T_mD = 7, - GPRS_LLC_XID_T_mU = 8, - GPRS_LLC_XID_T_kD = 9, - GPRS_LLC_XID_T_kU = 10, - GPRS_LLC_XID_T_L3_PAR = 11, - GPRS_LLC_XID_T_RESET = 12, +enum osmo_gprs_llc_xid_type { + OSMO_GPRS_LLC_XID_T_VERSION = 0, + OSMO_GPRS_LLC_XID_T_IOV_UI = 1, + OSMO_GPRS_LLC_XID_T_IOV_I = 2, + OSMO_GPRS_LLC_XID_T_T200 = 3, + OSMO_GPRS_LLC_XID_T_N200 = 4, + OSMO_GPRS_LLC_XID_T_N201_U = 5, + OSMO_GPRS_LLC_XID_T_N201_I = 6, + OSMO_GPRS_LLC_XID_T_mD = 7, + OSMO_GPRS_LLC_XID_T_mU = 8, + OSMO_GPRS_LLC_XID_T_kD = 9, + OSMO_GPRS_LLC_XID_T_kU = 10, + OSMO_GPRS_LLC_XID_T_L3_PAR = 11, + OSMO_GPRS_LLC_XID_T_RESET = 12, }; /* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ /* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ -enum gprs_llc_primitive { +enum osmo_gprs_llc_primitive { /* GMM <-> LLME */ - LLGMM_ASSIGN_REQ, /* GMM tells us new TLLI: TLLI old, TLLI new, Kc, CiphAlg */ - LLGMM_RESET_REQ, /* GMM tells us to perform XID negotiation: TLLI */ - LLGMM_RESET_CNF, /* LLC informs GMM that XID has completed: TLLI */ - LLGMM_SUSPEND_REQ, /* GMM tells us MS has suspended: TLLI, Page */ - LLGMM_RESUME_REQ, /* GMM tells us MS has resumed: TLLI */ - LLGMM_PAGE_IND, /* LLC asks GMM to page MS: TLLI */ - LLGMM_IOV_REQ, /* GMM tells us to perform XID: TLLI */ - LLGMM_STATUS_IND, /* LLC informs GMM about error: TLLI, Cause */ + OSMO_GPRS_LLC_LLGMM_ASSIGN_REQ, /* GMM tells us new TLLI: TLLI old, TLLI new, Kc, CiphAlg */ + OSMO_GPRS_LLC_LLGMM_RESET_REQ, /* GMM tells us to perform XID negotiation: TLLI */ + OSMO_GPRS_LLC_LLGMM_RESET_CNF, /* LLC informs GMM that XID has completed: TLLI */ + OSMO_GPRS_LLC_LLGMM_SUSPEND_REQ, /* GMM tells us MS has suspended: TLLI, Page */ + OSMO_GPRS_LLC_LLGMM_RESUME_REQ, /* GMM tells us MS has resumed: TLLI */ + OSMO_GPRS_LLC_LLGMM_PAGE_IND, /* LLC asks GMM to page MS: TLLI */ + OSMO_GPRS_LLC_LLGMM_IOV_REQ, /* GMM tells us to perform XID: TLLI */ + OSMO_GPRS_LLC_LLGMM_STATUS_IND, /* LLC informs GMM about error: TLLI, Cause */ /* LLE <-> (GMM/SNDCP/SMS/TOM) */ - LL_RESET_IND, /* TLLI */ - LL_ESTABLISH_REQ, /* TLLI, XID Req */ - LL_ESTABLISH_IND, /* TLLI, XID Req, N201-I, N201-U */ - LL_ESTABLISH_RESP, /* TLLI, XID Negotiated */ - LL_ESTABLISH_CONF, /* TLLI, XID Neg, N201-i, N201-U */ - LL_RELEASE_REQ, /* TLLI, Local */ - LL_RELEASE_IND, /* TLLI, Cause */ - LL_RELEASE_CONF, /* TLLI */ - LL_XID_REQ, /* TLLI, XID Requested */ - LL_XID_IND, /* TLLI, XID Req, N201-I, N201-U */ - LL_XID_RESP, /* TLLI, XID Negotiated */ - LL_XID_CONF, /* TLLI, XID Neg, N201-I, N201-U */ - LL_DATA_REQ, /* TLLI, SN-PDU, Ref, QoS, Radio Prio, Ciph */ - LL_DATA_IND, /* TLLI, SN-PDU */ - LL_DATA_CONF, /* TLLI, Ref */ - LL_UNITDATA_REQ, /* TLLI, SN-PDU, Ref, QoS, Radio Prio, Ciph */ - LL_UNITDATA_IND, /* TLLI, SN-PDU */ - LL_STATUS_IND, /* TLLI, Cause */ + OSMO_GPRS_LLC_LL_RESET_IND, /* TLLI */ + OSMO_GPRS_LLC_LL_ESTABLISH_REQ, /* TLLI, XID Req */ + OSMO_GPRS_LLC_LL_ESTABLISH_IND, /* TLLI, XID Req, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_ESTABLISH_RESP, /* TLLI, XID Negotiated */ + OSMO_GPRS_LLC_LL_ESTABLISH_CONF, /* TLLI, XID Neg, N201-i, N201-U */ + OSMO_GPRS_LLC_LL_RELEASE_REQ, /* TLLI, Local */ + OSMO_GPRS_LLC_LL_RELEASE_IND, /* TLLI, Cause */ + OSMO_GPRS_LLC_LL_RELEASE_CONF, /* TLLI */ + OSMO_GPRS_LLC_LL_XID_REQ, /* TLLI, XID Requested */ + OSMO_GPRS_LLC_LL_XID_IND, /* TLLI, XID Req, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_XID_RESP, /* TLLI, XID Negotiated */ + OSMO_GPRS_LLC_LL_XID_CONF, /* TLLI, XID Neg, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_DATA_REQ, /* TLLI, SN-PDU, Ref, QoS, Radio Prio, Ciph */ + OSMO_GPRS_LLC_LL_DATA_IND, /* TLLI, SN-PDU */ + OSMO_GPRS_LLC_LL_DATA_CONF, /* TLLI, Ref */ + OSMO_GPRS_LLC_LL_UNITDATA_REQ, /* TLLI, SN-PDU, Ref, QoS, Radio Prio, Ciph */ + OSMO_GPRS_LLC_LL_UNITDATA_IND, /* TLLI, SN-PDU */ + OSMO_GPRS_LLC_LL_STATUS_IND, /* TLLI, Cause */ }; /* Section 4.5.2 Logical Link States + Annex C.2 */ -enum gprs_llc_lle_state { - GPRS_LLES_UNASSIGNED = 1, /* No TLLI yet */ - GPRS_LLES_ASSIGNED_ADM = 2, /* TLLI assigned */ - GPRS_LLES_LOCAL_EST = 3, /* Local Establishment */ - GPRS_LLES_REMOTE_EST = 4, /* Remote Establishment */ - GPRS_LLES_ABM = 5, - GPRS_LLES_LOCAL_REL = 6, /* Local Release */ - GPRS_LLES_TIMER_REC = 7, /* Timer Recovery */ +enum osmo_gprs_llc_lle_state { + OSMO_GPRS_LLC_LLES_UNASSIGNED = 1, /* No TLLI yet */ + OSMO_GPRS_LLC_LLES_ASSIGNED_ADM = 2, /* TLLI assigned */ + OSMO_GPRS_LLC_LLES_LOCAL_EST = 3, /* Local Establishment */ + OSMO_GPRS_LLC_LLES_REMOTE_EST = 4, /* Remote Establishment */ + OSMO_GPRS_LLC_LLES_ABM = 5, + OSMO_GPRS_LLC_LLES_LOCAL_REL = 6, /* Local Release */ + OSMO_GPRS_LLC_LLES_TIMER_REC = 7, /* Timer Recovery */ }; -enum gprs_llc_llme_state { - GPRS_LLMS_UNASSIGNED = 1, /* No TLLI yet */ - GPRS_LLMS_ASSIGNED = 2, /* TLLI assigned */ +enum osmo_gprs_llc_llme_state { + OSMO_GPRS_LLC_LLMS_UNASSIGNED = 1, /* No TLLI yet */ + OSMO_GPRS_LLC_LLMS_ASSIGNED = 2, /* TLLI assigned */ }; /* Section 8.9.9 LLC layer parameter default values */ -struct gprs_llc_params { +struct osmo_gprs_llc_params { uint16_t iov_i_exp; uint16_t t200_201; uint16_t n200; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I569d8023d701bd14ee78baa9394b6983d9cafca8 Gerrit-Change-Number: 29394 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: enum osmo_gprs_llc_sapi: fix spec reference

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29395 ) Change subject: llc: enum osmo_gprs_llc_sapi: fix spec reference ...................................................................... llc: enum osmo_gprs_llc_sapi: fix spec reference The actual SAPI values are given in section 6.2.3, table 2. Change-Id: I84de7718e12b6b55a1735da148d7f8b0dacb72df --- M include/osmocom/gprs/llc/llc.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/95/29395/1 diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 1dc3cc7..c568eac 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -4,7 +4,7 @@ #include <stdint.h> -/* Section 4.7 LLC Layer Structure */ +/* Section 6.2.3 Service Access Point Identifier (SAPI) */ enum osmo_gprs_llc_sapi { OSMO_GPRS_LLC_SAPI_GMM = 1, OSMO_GPRS_LLC_SAPI_TOM2 = 2, -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I84de7718e12b6b55a1735da148d7f8b0dacb72df Gerrit-Change-Number: 29395 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: check-in basic LLC definitions from osmo-sgsn.git

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29393 ) Change subject: llc: check-in basic LLC definitions from osmo-sgsn.git ...................................................................... llc: check-in basic LLC definitions from osmo-sgsn.git osmo-sgsn.git fb6cf3221ef4989441c09a650011e4a334c37d12 Change-Id: I6ed0f4820b3a12a00be71ce63757765551743101 --- M include/osmocom/gprs/llc/Makefile.am A include/osmocom/gprs/llc/llc.h 2 files changed, 97 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/93/29393/1 diff --git a/include/osmocom/gprs/llc/Makefile.am b/include/osmocom/gprs/llc/Makefile.am index d394413..5f44218 100644 --- a/include/osmocom/gprs/llc/Makefile.am +++ b/include/osmocom/gprs/llc/Makefile.am @@ -1,4 +1,5 @@ llc_HEADERS = \ + llc.h \ $(NULL) llcdir = $(includedir)/osmocom/gprs/llc diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h new file mode 100644 index 0000000..064df58 --- /dev/null +++ b/include/osmocom/gprs/llc/llc.h @@ -0,0 +1,96 @@ +#pragma once + +/* LLC (Logical Link Control) definitions from 3GPP TS 44.064 */ + +#include <stdint.h> + +/* Section 4.7 LLC Layer Structure */ +enum gprs_llc_sapi { + GPRS_SAPI_GMM = 1, + GPRS_SAPI_TOM2 = 2, + GPRS_SAPI_SNDCP3 = 3, + GPRS_SAPI_SNDCP5 = 5, + GPRS_SAPI_SMS = 7, + GPRS_SAPI_TOM8 = 8, + GPRS_SAPI_SNDCP9 = 9, + GPRS_SAPI_SNDCP11 = 11, +}; + +/* Section 6.4.1.6 / Table 6 */ +enum gprs_llc_xid_type { + GPRS_LLC_XID_T_VERSION = 0, + GPRS_LLC_XID_T_IOV_UI = 1, + GPRS_LLC_XID_T_IOV_I = 2, + GPRS_LLC_XID_T_T200 = 3, + GPRS_LLC_XID_T_N200 = 4, + GPRS_LLC_XID_T_N201_U = 5, + GPRS_LLC_XID_T_N201_I = 6, + GPRS_LLC_XID_T_mD = 7, + GPRS_LLC_XID_T_mU = 8, + GPRS_LLC_XID_T_kD = 9, + GPRS_LLC_XID_T_kU = 10, + GPRS_LLC_XID_T_L3_PAR = 11, + GPRS_LLC_XID_T_RESET = 12, +}; + +/* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ +/* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ +enum gprs_llc_primitive { + /* GMM <-> LLME */ + LLGMM_ASSIGN_REQ, /* GMM tells us new TLLI: TLLI old, TLLI new, Kc, CiphAlg */ + LLGMM_RESET_REQ, /* GMM tells us to perform XID negotiation: TLLI */ + LLGMM_RESET_CNF, /* LLC informs GMM that XID has completed: TLLI */ + LLGMM_SUSPEND_REQ, /* GMM tells us MS has suspended: TLLI, Page */ + LLGMM_RESUME_REQ, /* GMM tells us MS has resumed: TLLI */ + LLGMM_PAGE_IND, /* LLC asks GMM to page MS: TLLI */ + LLGMM_IOV_REQ, /* GMM tells us to perform XID: TLLI */ + LLGMM_STATUS_IND, /* LLC informs GMM about error: TLLI, Cause */ + /* LLE <-> (GMM/SNDCP/SMS/TOM) */ + LL_RESET_IND, /* TLLI */ + LL_ESTABLISH_REQ, /* TLLI, XID Req */ + LL_ESTABLISH_IND, /* TLLI, XID Req, N201-I, N201-U */ + LL_ESTABLISH_RESP, /* TLLI, XID Negotiated */ + LL_ESTABLISH_CONF, /* TLLI, XID Neg, N201-i, N201-U */ + LL_RELEASE_REQ, /* TLLI, Local */ + LL_RELEASE_IND, /* TLLI, Cause */ + LL_RELEASE_CONF, /* TLLI */ + LL_XID_REQ, /* TLLI, XID Requested */ + LL_XID_IND, /* TLLI, XID Req, N201-I, N201-U */ + LL_XID_RESP, /* TLLI, XID Negotiated */ + LL_XID_CONF, /* TLLI, XID Neg, N201-I, N201-U */ + LL_DATA_REQ, /* TLLI, SN-PDU, Ref, QoS, Radio Prio, Ciph */ + LL_DATA_IND, /* TLLI, SN-PDU */ + LL_DATA_CONF, /* TLLI, Ref */ + LL_UNITDATA_REQ, /* TLLI, SN-PDU, Ref, QoS, Radio Prio, Ciph */ + LL_UNITDATA_IND, /* TLLI, SN-PDU */ + LL_STATUS_IND, /* TLLI, Cause */ +}; + +/* Section 4.5.2 Logical Link States + Annex C.2 */ +enum gprs_llc_lle_state { + GPRS_LLES_UNASSIGNED = 1, /* No TLLI yet */ + GPRS_LLES_ASSIGNED_ADM = 2, /* TLLI assigned */ + GPRS_LLES_LOCAL_EST = 3, /* Local Establishment */ + GPRS_LLES_REMOTE_EST = 4, /* Remote Establishment */ + GPRS_LLES_ABM = 5, + GPRS_LLES_LOCAL_REL = 6, /* Local Release */ + GPRS_LLES_TIMER_REC = 7, /* Timer Recovery */ +}; + +enum gprs_llc_llme_state { + GPRS_LLMS_UNASSIGNED = 1, /* No TLLI yet */ + GPRS_LLMS_ASSIGNED = 2, /* TLLI assigned */ +}; + +/* Section 8.9.9 LLC layer parameter default values */ +struct gprs_llc_params { + uint16_t iov_i_exp; + uint16_t t200_201; + uint16_t n200; + uint16_t n201_u; + uint16_t n201_i; + uint16_t mD; + uint16_t mU; + uint16_t kD; + uint16_t kU; +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I6ed0f4820b3a12a00be71ce63757765551743101 Gerrit-Change-Number: 29393 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: Initial libosmo-gprs-llc library skeleton

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29392 ) Change subject: Initial libosmo-gprs-llc library skeleton ...................................................................... Initial libosmo-gprs-llc library skeleton Change-Id: Ia537acc6f4e6ab576dc7959d427b80f62c474296 --- M Makefile.am M README.md M configure.ac M contrib/libosmo-gprs.spec.in M debian/control M debian/copyright A debian/libosmo-gprs-llc-dev.install A debian/libosmo-gprs-llc0.install M debian/rules M include/osmocom/gprs/Makefile.am A include/osmocom/gprs/llc/Makefile.am A libosmo-gprs-llc.pc.in M src/Makefile.am A src/llc/Makefile.am 14 files changed, 145 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/92/29392/1 diff --git a/Makefile.am b/Makefile.am index ebaaf29..227694c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ libosmo-csn1.pc \ + libosmo-gprs-llc.pc \ libosmo-gprs-rlcmac.pc \ $(NULL) diff --git a/README.md b/README.md index 8a6c5c9..c857f66 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ This project is a home for several libraries providing common GPRS routines: * libosmo-csn1 - CSN.1 (Concrete Syntax Notation 1) codec, +* libosmo-gprs-llc - LLC (Logical Link Control) layer, * libosmo-gprs-rlcmac - RLC/MAC message definitions. Homepage diff --git a/configure.ac b/configure.ac index 0275362..6e9bcb4 100644 --- a/configure.ac +++ b/configure.ac @@ -73,14 +73,17 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([libosmo-csn1.pc + libosmo-gprs-llc.pc libosmo-gprs-rlcmac.pc include/Makefile include/osmocom/Makefile include/osmocom/csn1/Makefile include/osmocom/gprs/Makefile + include/osmocom/gprs/llc/Makefile include/osmocom/gprs/rlcmac/Makefile src/Makefile src/csn1/Makefile + src/llc/Makefile src/rlcmac/Makefile tests/Makefile tests/ts_44_018/Makefile diff --git a/contrib/libosmo-gprs.spec.in b/contrib/libosmo-gprs.spec.in index 6496749..9c27c2d 100644 --- a/contrib/libosmo-gprs.spec.in +++ b/contrib/libosmo-gprs.spec.in @@ -1,8 +1,8 @@ Name: libosmo-gprs Version: @VERSION@ Release: 0 -Summary: Osmocom GPRS libraries (CSN.1, RLC/MAC) -License: GPL-2.0-or-later +Summary: Osmocom GPRS libraries (CSN.1, RLC/MAC, LLC) +License: GPL-2.0-or-later and AGPL-3.0-or-later Group: Hardware/Mobile URL: https://osmocom.org/projects/libosmo-gprs Source: %{name}-%{version}.tar.xz @@ -16,8 +16,8 @@ %description Osmocom GPRS libraries (CSN.1, RLC/MAC) -This package provides Osmocom GPRS libraries used by osmocom-bb and -osmo-pcu: libosmo-csn1, libosmo-gprs-rlcmac. +This package provides Osmocom GPRS libraries used by osmocom-bb, osmo-pcu, +and osmo-sgsn: libosmo-csn1, libosmo-gprs-llc, libosmo-gprs-rlcmac. %package -n libosmo-csn1-0 Summary: CSN.1 (Concrete Syntax Notation 1) codec @@ -40,6 +40,24 @@ This package provides development files for compiling a program using libosmo-csn1 - CSN.1 (Concrete Syntax Notation 1) codec. +%package -n libosmo-gprs-llc0 +Summary: Osmocom GPRS LLC library +License: AGPL-3.0-or-later +Group: System/Libraries + +%description -n libosmo-gprs-llc0 +This package provides LLC (Logical Link Control) layer for (E)GPRS. + +%package -n libosmo-gprs-llc-devel +Summary: Development files for libosmo-gprs-llc +License: AGPL-3.0-or-later +Group: Development/Libraries/C and C++ +Requires: libosmo-gprs-llc0 = %{version} + +%description -n libosmo-gprs-llc-devel +This package provides development files for compiling a program using +libosmo-gprs-llc - LLC (Logical Link Control) layer for (E)GPRS. + %package -n libosmo-gprs-rlcmac0 Summary: Osmocom GPRS RLC/MAC library License: GPL-2.0-or-later @@ -78,6 +96,8 @@ %post -n libosmo-csn1-0 -p /sbin/ldconfig %postun -n libosmo-csn1-0 -p /sbin/ldconfig +%post -n libosmo-gprs-llc0 -p /sbin/ldconfig +%postun -n libosmo-gprs-llc0 -p /sbin/ldconfig %post -n libosmo-gprs-rlcmac0 -p /sbin/ldconfig %postun -n libosmo-gprs-rlcmac0 -p /sbin/ldconfig @@ -91,6 +111,17 @@ %_libdir/libosmo-csn1.so %_libdir/pkgconfig/libosmo-csn1.pc +%files -n libosmo-gprs-llc0 +%_libdir/libosmo-gprs-llc.so.0* + +%files -n libosmo-gprs-llc-devel +%dir %_includedir/%name +%dir %_includedir/%name/osmocom +%dir %_includedir/%name/osmocom/gprs +%_includedir/%name/osmocom/gprs/llc +%_libdir/libosmo-gprs-llc.so +%_libdir/pkgconfig/libosmo-gprs-llc.pc + %files -n libosmo-gprs-rlcmac0 %_libdir/libosmo-gprs-rlcmac.so.0* diff --git a/debian/control b/debian/control index 6af9a96..77a7767 100644 --- a/debian/control +++ b/debian/control @@ -43,6 +43,31 @@ ${misc:Depends} Description: Development headers and libraries for the Osmocom CSN.1 codec +Package: libosmo-gprs-llc0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: Osmocom LLC (Logical Link Control) layer for GPRS and EGPRS + +Package: libosmo-gprs-llc-dbg +Architecture: any +Section: debug +Multi-Arch: same +Depends: libosmo-gprs-llc0 (= ${binary:Version}), + ${misc:Depends} +Description: Debug symbols for libosmo-gprs-llc + +Package: libosmo-gprs-llc-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: libosmo-gprs-llc0 (= ${binary:Version}), + ${misc:Depends} +Description: Development headers and libraries for libosmo-gprs-llc + Package: libosmo-gprs-rlcmac0 Section: libs Architecture: any diff --git a/debian/copyright b/debian/copyright index 718bd5a..2ff9bd6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -29,3 +29,24 @@ . You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + +Files: src/llc/* + include/osmocom/llc/* +Copyright: 2008-2015 Holger Hans Peter Freyther <zecke(a)selfish.org> + 2008-2016 Harald Welte <laforge(a)gnumonks.org> + 2011-2022 sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> +License: AGPL-3.0+ + +License: AGPL-3.0+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + . + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/debian/libosmo-gprs-llc-dev.install b/debian/libosmo-gprs-llc-dev.install new file mode 100644 index 0000000..b4d76e5 --- /dev/null +++ b/debian/libosmo-gprs-llc-dev.install @@ -0,0 +1,5 @@ +usr/include/osmocom/gprs/llc +usr/lib/*/libosmo-gprs-llc*.a +usr/lib/*/libosmo-gprs-llc*.so +usr/lib/*/libosmo-gprs-llc*.la +usr/lib/*/pkgconfig/libosmo-gprs-llc.pc diff --git a/debian/libosmo-gprs-llc0.install b/debian/libosmo-gprs-llc0.install new file mode 100644 index 0000000..fcd940e --- /dev/null +++ b/debian/libosmo-gprs-llc0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-gprs-llc*.so.* diff --git a/debian/rules b/debian/rules index 514453c..7701a8e 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,7 @@ # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practic… override_dh_strip: dh_strip -plibosmo-csn1-0 --dbg-package=libosmo-csn1-dbg + dh_strip -plibosmo-gprs-llc0 --dbg-package=libosmo-gprs-llc-dbg dh_strip -plibosmo-gprs-rlcmac0 --dbg-package=libosmo-gprs-rlcmac-dbg # Print test results in case of a failure diff --git a/include/osmocom/gprs/Makefile.am b/include/osmocom/gprs/Makefile.am index f3bd3c1..56b22de 100644 --- a/include/osmocom/gprs/Makefile.am +++ b/include/osmocom/gprs/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ + llc \ rlcmac \ $(NULL) diff --git a/include/osmocom/gprs/llc/Makefile.am b/include/osmocom/gprs/llc/Makefile.am new file mode 100644 index 0000000..d394413 --- /dev/null +++ b/include/osmocom/gprs/llc/Makefile.am @@ -0,0 +1,4 @@ +llc_HEADERS = \ + $(NULL) + +llcdir = $(includedir)/osmocom/gprs/llc diff --git a/libosmo-gprs-llc.pc.in b/libosmo-gprs-llc.pc.in new file mode 100644 index 0000000..8a1ae95 --- /dev/null +++ b/libosmo-gprs-llc.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom [E]GPRS LLC (Logical Link Control) Library +Description: C Utility Library +Version: @VERSION@ +Requires: libosmocore +Libs: -L${libdir} -losmo-gprs-llc +Cflags: -I${includedir}/ diff --git a/src/Makefile.am b/src/Makefile.am index 962d182..6a02887 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ csn1 \ + llc \ rlcmac \ $(NULL) diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am new file mode 100644 index 0000000..5f9fac3 --- /dev/null +++ b/src/llc/Makefile.am @@ -0,0 +1,35 @@ +# This is _NOT_ the library release version, it's an API version. +# Please read Chapter 6 "Library interface versions" of the libtool +# documentation before making any modification +LIBVERSION=0:0:0 + +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(LIBOSMOCORE_LIBS) \ + $(NULL) + +lib_LTLIBRARIES = \ + libosmo-gprs-llc.la \ + $(NULL) + +libosmo_gprs_llc_la_SOURCES = \ + $(NULL) + +# TODO: -export-symbols-regex '^osmo_' +libosmo_gprs_llc_la_LDFLAGS = \ + -version-info $(LIBVERSION) \ + -no-undefined \ + $(NULL) + +libosmo_gprs_llc_la_LIBADD = \ + $(LIBOSMOCORE_LIBS) \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ia537acc6f4e6ab576dc7959d427b80f62c474296 Gerrit-Change-Number: 29392 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-hlr[master]: Debian: bump compatibility level

by msuraev

Attention is currently required from: laforge, msuraev. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/29381 to look at the new patch set (#4). Change subject: Debian: bump compatibility level ...................................................................... Debian: bump compatibility level See https://manpages.debian.org/bullseye/debhelper/debhelper.7.en.html for exact changes between versions Related: OS#4107 Change-Id: Id1557cd07b5d28dbb6018cbf972ce41008b65867 --- M .gitignore M debian/compat 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/81/29381/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Id1557cd07b5d28dbb6018cbf972ce41008b65867 Gerrit-Change-Number: 29381 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022