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

Change in osmo-mgw[master]: mgcp_network: improve coment

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31021 ) Change subject: mgcp_network: improve coment ...................................................................... mgcp_network: improve coment the comment that explains the AMR frame format check is a bit difficult to understand, lets rephrase it. Change-Id: I07f12c03449e1e8eda8bdd3edad6d1007f5ba48d --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/31021/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index d93e695..d6028a2 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1537,12 +1537,11 @@ if (!trunk->rtp_accept_all && check_rtp_origin(conn_src, from_addr)) return -1; - /* If AMR is configured for the ingress connection and conversion of the - * framing mode (octet-aligned vs. bandwith-efficient) is explicitly - * defined, then we check if the incoming payload matches that - * expectation. */ + /* Handle AMR frame format conversion (octet-aligned vs. bandwith-efficient) */ if (mc->proto == MGCP_PROTO_RTP && mgcp_codec_amr_align_mode_is_indicated(conn_src->end.codec)) { + /* Make sure that the incoming AMR frame format matches the frame format that the call agent has + * communicated via SDP when the connection was created/modfied. */ int oa = amr_oa_check((char*)msgb_data(msg), msgb_length(msg)); if (oa < 0) return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I07f12c03449e1e8eda8bdd3edad6d1007f5ba48d Gerrit-Change-Number: 31021 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-mgw[master]: mgcp_network: fix typo

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27390 ) Change subject: mgcp_network: fix typo ...................................................................... Abandoned the comment is still a bit strange, lets make a new patch with a better comment. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I23f6672338b26eb74f6d3a753a3863e02af24ae0 Gerrit-Change-Number: 27390 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Makefile.am: Remove unexsiting all_includes variable

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31017 ) Change subject: Makefile.am: Remove unexsiting all_includes variable ...................................................................... Makefile.am: Remove unexsiting all_includes variable Change-Id: I9bc7de6f85558e55265c6cc965bc7fe97a6736ee --- M Makefile.am M src/ctrl/Makefile.am M src/pseudotalloc/Makefile.am M src/sim/Makefile.am M src/usb/Makefile.am 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved dexter: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index 4347807..48d6e9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include SUBDIRS = \ include \ src \ diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index f149acb..20de7d6 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=7:0:7 -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_CTRL diff --git a/src/pseudotalloc/Makefile.am b/src/pseudotalloc/Makefile.am index b631eca..1b86183 100644 --- a/src/pseudotalloc/Makefile.am +++ b/src/pseudotalloc/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I. $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall if ENABLE_PSEUDOTALLOC diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 4ef4490..51424c7 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:1:1 -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am index c8e557b..b097aa7 100644 --- a/src/usb/Makefile.am +++ b/src/usb/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=0:1:0 -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(LIBUSB_CFLAGS) $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bc7de6f85558e55265c6cc965bc7fe97a6736ee Gerrit-Change-Number: 31017 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Split include/Makefile.am content into subdirs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31015 ) Change subject: Split include/Makefile.am content into subdirs ...................................................................... Split include/Makefile.am content into subdirs When someone is modifying a given library there's no need to be looking at a common file contains tons of lines from different libraries. Furthermore, this removes the need of "nobase" autofoo prefix, hence following the usual directive of having one Makefile per directory. Change-Id: I785891c2f89114bf8303c799094b637d3d25ac71 --- M configure.ac M include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/codec/Makefile.am A include/osmocom/coding/Makefile.am A include/osmocom/core/Makefile.am A include/osmocom/crypt/Makefile.am A include/osmocom/ctrl/Makefile.am A include/osmocom/gprs/Makefile.am A include/osmocom/gprs/protocol/Makefile.am A include/osmocom/gsm/Makefile.am A include/osmocom/gsm/protocol/Makefile.am A include/osmocom/sim/Makefile.am A include/osmocom/usb/Makefile.am A include/osmocom/vty/Makefile.am 15 files changed, 305 insertions(+), 225 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 5f70fca..9c9681d 100644 --- a/configure.ac +++ b/configure.ac @@ -585,6 +585,19 @@ libosmosim.pc libosmousb.pc include/Makefile + include/osmocom/Makefile + include/osmocom/codec/Makefile + include/osmocom/coding/Makefile + include/osmocom/core/Makefile + include/osmocom/crypt/Makefile + include/osmocom/ctrl/Makefile + include/osmocom/gprs/Makefile + include/osmocom/gprs/protocol/Makefile + include/osmocom/gsm/Makefile + include/osmocom/gsm/protocol/Makefile + include/osmocom/sim/Makefile + include/osmocom/usb/Makefile + include/osmocom/vty/Makefile src/Makefile src/core/Makefile src/vty/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index a234014..3578a80 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,225 +1 @@ -BUILT_SOURCES = osmocom/gsm/gsm0503.h - -nobase_include_HEADERS = \ - osmocom/codec/ecu.h \ - osmocom/codec/codec.h \ - osmocom/codec/gsm610_bits.h \ - osmocom/core/application.h \ - osmocom/core/backtrace.h \ - osmocom/core/base64.h \ - osmocom/core/bit16gen.h \ - osmocom/core/bit32gen.h \ - osmocom/core/bit64gen.h \ - osmocom/core/bits.h \ - osmocom/core/bitvec.h \ - osmocom/core/bitcomp.h \ - osmocom/core/byteswap.h \ - osmocom/core/conv.h \ - osmocom/core/counter.h \ - osmocom/core/crc16.h \ - osmocom/core/crc16gen.h \ - osmocom/core/crc32gen.h \ - osmocom/core/crc64gen.h \ - osmocom/core/crc8gen.h \ - osmocom/core/crcgen.h \ - osmocom/core/endian.h \ - osmocom/core/defs.h \ - osmocom/core/exec.h \ - osmocom/core/fsm.h \ - osmocom/core/gsmtap.h \ - osmocom/core/gsmtap_util.h \ - osmocom/core/hash.h \ - osmocom/core/hashtable.h \ - osmocom/core/isdnhdlc.h \ - osmocom/core/it_q.h \ - osmocom/core/linuxlist.h \ - osmocom/core/linuxrbtree.h \ - osmocom/core/log2.h \ - osmocom/core/logging.h \ - osmocom/core/loggingrb.h \ - osmocom/core/stats.h \ - osmocom/core/macaddr.h \ - osmocom/core/msgb.h \ - osmocom/core/panic.h \ - osmocom/core/prbs.h \ - osmocom/core/prim.h \ - osmocom/core/process.h \ - osmocom/core/rate_ctr.h \ - osmocom/core/stat_item.h \ - osmocom/core/stats_tcp.h \ - osmocom/core/select.h \ - osmocom/core/sercomm.h \ - osmocom/core/signal.h \ - osmocom/core/socket.h \ - osmocom/core/statistics.h \ - osmocom/core/strrb.h \ - osmocom/core/talloc.h \ - osmocom/core/tdef.h \ - osmocom/core/thread.h \ - osmocom/core/timer.h \ - osmocom/core/timer_compat.h \ - osmocom/core/utils.h \ - osmocom/core/write_queue.h \ - osmocom/core/sockaddr_str.h \ - osmocom/core/time_cc.h \ - osmocom/core/use_count.h \ - osmocom/crypt/auth.h \ - osmocom/crypt/gprs_cipher.h \ - osmocom/crypt/kdf.h \ - osmocom/crypt/utran_cipher.h \ - osmocom/ctrl/control_cmd.h \ - osmocom/ctrl/control_if.h \ - osmocom/ctrl/ports.h \ - osmocom/gprs/frame_relay.h \ - osmocom/gprs/bssgp_bvc_fsm.h \ - osmocom/gprs/gprs_bssgp.h \ - osmocom/gprs/gprs_bssgp2.h \ - osmocom/gprs/gprs_bssgp_bss.h \ - osmocom/gprs/gprs_bssgp_rim.h \ - osmocom/gprs/gprs_msgb.h \ - osmocom/gprs/gprs_ns.h \ - osmocom/gprs/gprs_ns_frgre.h \ - osmocom/gprs/gprs_ns2.h \ - osmocom/gprs/gprs_rlc.h \ - osmocom/gprs/protocol/gsm_04_60.h \ - osmocom/gprs/protocol/gsm_08_16.h \ - osmocom/gprs/protocol/gsm_08_18.h \ - osmocom/gprs/protocol/gsm_24_301.h \ - osmocom/gsm/a5.h \ - osmocom/gsm/abis_nm.h \ - osmocom/gsm/apn.h \ - osmocom/gsm/bts_features.h \ - osmocom/gsm/cbsp.h \ - osmocom/gsm/comp128.h \ - osmocom/gsm/comp128v23.h \ - osmocom/gsm/bitvec_gsm.h \ - osmocom/gsm/gan.h \ - osmocom/gsm/gsm0341.h \ - osmocom/gsm/gsm0411_smc.h \ - osmocom/gsm/gsm0411_smr.h \ - osmocom/gsm/gsm0411_utils.h \ - osmocom/gsm/gsm0480.h \ - osmocom/gsm/gsm0502.h \ - osmocom/gsm/gsm0503.h \ - osmocom/coding/gsm0503_tables.h \ - osmocom/coding/gsm0503_parity.h \ - osmocom/coding/gsm0503_mapping.h \ - osmocom/coding/gsm0503_interleaving.h \ - osmocom/coding/gsm0503_coding.h \ - osmocom/coding/gsm0503_amr_dtx.h \ - osmocom/gsm/bsslap.h \ - osmocom/gsm/bssmap_le.h \ - osmocom/gsm/gad.h \ - osmocom/gsm/gsm0808.h \ - osmocom/gsm/gsm0808_lcs.h \ - osmocom/gsm/gsm29205.h \ - osmocom/gsm/gsm0808_utils.h \ - osmocom/gsm/gsm23003.h \ - osmocom/gsm/gsm23236.h \ - osmocom/gsm/gsm29118.h \ - osmocom/gsm/gsm48.h \ - osmocom/gsm/gsm48_arfcn_range_encode.h \ - osmocom/gsm/gsm48_ie.h \ - osmocom/gsm/gsm48_rest_octets.h \ - osmocom/gsm/gsm_utils.h \ - osmocom/gsm/gsup.h \ - osmocom/gsm/gsup_sms.h \ - osmocom/gsm/i460_mux.h \ - osmocom/gsm/ipa.h \ - osmocom/gsm/iuup.h \ - osmocom/gsm/lapd_core.h \ - osmocom/gsm/lapdm.h \ - osmocom/gsm/meas_rep.h \ - osmocom/gsm/mncc.h \ - osmocom/gsm/prim.h \ - osmocom/gsm/l1sap.h \ - osmocom/gsm/oap.h \ - osmocom/gsm/oap_client.h \ - osmocom/gsm/protocol/gsm_23_032.h \ - osmocom/gsm/protocol/gsm_03_40.h \ - osmocom/gsm/protocol/gsm_03_41.h \ - osmocom/gsm/protocol/gsm_04_08.h \ - osmocom/gsm/protocol/gsm_04_08_gprs.h \ - osmocom/gsm/protocol/gsm_04_11.h \ - osmocom/gsm/protocol/gsm_04_12.h \ - osmocom/gsm/protocol/gsm_04_14.h \ - osmocom/gsm/protocol/gsm_04_80.h \ - osmocom/gsm/protocol/gsm_08_08.h \ - osmocom/gsm/protocol/gsm_08_58.h \ - osmocom/gsm/protocol/gsm_09_02.h \ - osmocom/gsm/protocol/gsm_12_21.h \ - osmocom/gsm/protocol/gsm_23_003.h \ - osmocom/gsm/protocol/gsm_23_041.h \ - osmocom/gsm/protocol/gsm_25_415.h \ - osmocom/gsm/protocol/gsm_29_118.h \ - osmocom/gsm/protocol/gsm_44_004.h \ - osmocom/gsm/protocol/gsm_44_318.h \ - osmocom/gsm/protocol/gsm_48_049.h \ - osmocom/gsm/protocol/gsm_48_071.h \ - osmocom/gsm/protocol/gsm_49_031.h \ - osmocom/gsm/protocol/ipaccess.h \ - osmocom/gsm/protocol/smpp34_osmocom.h \ - osmocom/gsm/rsl.h \ - osmocom/gsm/rxlev_stat.h \ - osmocom/gsm/sysinfo.h \ - osmocom/gsm/tlv.h \ - osmocom/sim/class_tables.h \ - osmocom/sim/sim.h - -if ENABLE_PLUGIN -nobase_include_HEADERS += osmocom/core/plugin.h -endif - -if ENABLE_MSGFILE -nobase_include_HEADERS += osmocom/core/msgfile.h -endif - -if ENABLE_SERIAL -nobase_include_HEADERS += osmocom/core/serial.h -endif - - -if ENABLE_VTY -nobase_include_HEADERS += \ - osmocom/vty/buffer.h \ - osmocom/vty/command.h \ - osmocom/vty/logging.h \ - osmocom/vty/stats.h \ - osmocom/vty/misc.h \ - osmocom/vty/telnet_interface.h \ - osmocom/vty/vector.h \ - osmocom/vty/vty.h \ - osmocom/vty/ports.h \ - osmocom/vty/cpu_sched_vty.h \ - osmocom/vty/tdef_vty.h \ - osmocom/ctrl/control_vty.h -endif - -if ENABLE_LIBUSB -nobase_include_HEADERS += \ - osmocom/usb/libusb.h -endif - -if ENABLE_LIBMNL -nobase_include_HEADERS += osmocom/core/mnl.h -endif - -noinst_HEADERS = \ - osmocom/gsm/kasumi.h \ - osmocom/gsm/gea.h \ - osmocom/core/logging_internal.h \ - $(NULL) - -osmocom/core/bit%gen.h: osmocom/core/bitXXgen.h.tpl - $(AM_V_GEN)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ - -osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl - $(AM_V_GEN)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ - -osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_header gsm \ - --target-path $(builddir)/osmocom/gsm - -CLEANFILES = osmocom/gsm/gsm0503.h +SUBDIRS = osmocom diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am new file mode 100644 index 0000000..1cc3fb7 --- /dev/null +++ b/include/osmocom/Makefile.am @@ -0,0 +1,12 @@ +SUBDIRS = \ + core \ + vty \ + codec \ + gsm \ + crypt \ + coding \ + gprs \ + ctrl \ + sim \ + usb \ + $(NULL) diff --git a/include/osmocom/codec/Makefile.am b/include/osmocom/codec/Makefile.am new file mode 100644 index 0000000..63ae402 --- /dev/null +++ b/include/osmocom/codec/Makefile.am @@ -0,0 +1,7 @@ +osmocodec_HEADERS = \ + ecu.h \ + codec.h \ + gsm610_bits.h \ + $(NULL) + +osmocodecdir = $(includedir)/osmocom/codec diff --git a/include/osmocom/coding/Makefile.am b/include/osmocom/coding/Makefile.am new file mode 100644 index 0000000..713b193 --- /dev/null +++ b/include/osmocom/coding/Makefile.am @@ -0,0 +1,10 @@ +osmocoding_HEADERS = \ + gsm0503_tables.h \ + gsm0503_parity.h \ + gsm0503_mapping.h \ + gsm0503_interleaving.h \ + gsm0503_coding.h \ + gsm0503_amr_dtx.h \ + $(NULL) + +osmocodingdir = $(includedir)/osmocom/coding diff --git a/include/osmocom/core/Makefile.am b/include/osmocom/core/Makefile.am new file mode 100644 index 0000000..1b0a1ce --- /dev/null +++ b/include/osmocom/core/Makefile.am @@ -0,0 +1,91 @@ +osmocore_HEADERS = \ + application.h \ + backtrace.h \ + base64.h \ + bit16gen.h \ + bit32gen.h \ + bit64gen.h \ + bits.h \ + bitvec.h \ + bitcomp.h \ + byteswap.h \ + conv.h \ + counter.h \ + crc16.h \ + crc16gen.h \ + crc32gen.h \ + crc64gen.h \ + crc8gen.h \ + crcgen.h \ + endian.h \ + defs.h \ + exec.h \ + fsm.h \ + gsmtap.h \ + gsmtap_util.h \ + hash.h \ + hashtable.h \ + isdnhdlc.h \ + it_q.h \ + linuxlist.h \ + linuxrbtree.h \ + log2.h \ + logging.h \ + loggingrb.h \ + stats.h \ + macaddr.h \ + msgb.h \ + panic.h \ + prbs.h \ + prim.h \ + process.h \ + rate_ctr.h \ + stat_item.h \ + stats_tcp.h \ + select.h \ + sercomm.h \ + signal.h \ + socket.h \ + statistics.h \ + strrb.h \ + talloc.h \ + tdef.h \ + thread.h \ + timer.h \ + timer_compat.h \ + utils.h \ + write_queue.h \ + sockaddr_str.h \ + time_cc.h \ + use_count.h \ + $(NULL) + +if ENABLE_PLUGIN +osmocore_HEADERS += plugin.h +endif + +if ENABLE_MSGFILE +osmocore_HEADERS += msgfile.h +endif + +if ENABLE_SERIAL +osmocore_HEADERS += serial.h +endif + +if ENABLE_LIBMNL +osmocore_HEADERS += mnl.h +endif + +osmocoredir = $(includedir)/osmocom/core + +noinst_HEADERS = \ + logging_internal.h \ + $(NULL) + +bit%gen.h: bitXXgen.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ + +crc%gen.h: crcXXgen.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ diff --git a/include/osmocom/crypt/Makefile.am b/include/osmocom/crypt/Makefile.am new file mode 100644 index 0000000..fa391bb --- /dev/null +++ b/include/osmocom/crypt/Makefile.am @@ -0,0 +1,8 @@ +osmocrypt_HEADERS = \ + auth.h \ + gprs_cipher.h \ + kdf.h \ + utran_cipher.h \ + $(NULL) + +osmocryptdir = $(includedir)/osmocom/crypt diff --git a/include/osmocom/ctrl/Makefile.am b/include/osmocom/ctrl/Makefile.am new file mode 100644 index 0000000..416e3ab --- /dev/null +++ b/include/osmocom/ctrl/Makefile.am @@ -0,0 +1,13 @@ +osmoctrl_HEADERS = \ + control_cmd.h \ + control_if.h \ + ports.h \ + $(NULL) + +if ENABLE_VTY +osmoctrl_HEADERS += \ + control_vty.h \ + $(NULL) +endif + +osmoctrldir = $(includedir)/osmocom/ctrl diff --git a/include/osmocom/gprs/Makefile.am b/include/osmocom/gprs/Makefile.am new file mode 100644 index 0000000..289be57 --- /dev/null +++ b/include/osmocom/gprs/Makefile.am @@ -0,0 +1,17 @@ +SUBDIRS = protocol + +osmogprs_HEADERS = \ + frame_relay.h \ + bssgp_bvc_fsm.h \ + gprs_bssgp.h \ + gprs_bssgp2.h \ + gprs_bssgp_bss.h \ + gprs_bssgp_rim.h \ + gprs_msgb.h \ + gprs_ns.h \ + gprs_ns_frgre.h \ + gprs_ns2.h \ + gprs_rlc.h \ + $(NULL) + +osmogprsdir = $(includedir)/osmocom/gprs diff --git a/include/osmocom/gprs/protocol/Makefile.am b/include/osmocom/gprs/protocol/Makefile.am new file mode 100644 index 0000000..e69527d --- /dev/null +++ b/include/osmocom/gprs/protocol/Makefile.am @@ -0,0 +1,8 @@ +osmogprsproto_HEADERS = \ + gsm_04_60.h \ + gsm_08_16.h \ + gsm_08_18.h \ + gsm_24_301.h \ + $(NULL) + +osmogprsprotodir = $(includedir)/osmocom/gprs/protocol diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am new file mode 100644 index 0000000..2c59e55 --- /dev/null +++ b/include/osmocom/gsm/Makefile.am @@ -0,0 +1,67 @@ +SUBDIRS = protocol + +BUILT_SOURCES = gsm0503.h + +osmogsm_HEADERS = \ + a5.h \ + abis_nm.h \ + apn.h \ + bts_features.h \ + cbsp.h \ + comp128.h \ + comp128v23.h \ + bitvec_gsm.h \ + gan.h \ + gsm0341.h \ + gsm0411_smc.h \ + gsm0411_smr.h \ + gsm0411_utils.h \ + gsm0480.h \ + gsm0502.h \ + gsm0503.h \ + bsslap.h \ + bssmap_le.h \ + gad.h \ + gsm0808.h \ + gsm0808_lcs.h \ + gsm29205.h \ + gsm0808_utils.h \ + gsm23003.h \ + gsm23236.h \ + gsm29118.h \ + gsm48.h \ + gsm48_arfcn_range_encode.h \ + gsm48_ie.h \ + gsm48_rest_octets.h \ + gsm_utils.h \ + gsup.h \ + gsup_sms.h \ + i460_mux.h \ + ipa.h \ + iuup.h \ + lapd_core.h \ + lapdm.h \ + meas_rep.h \ + mncc.h \ + prim.h \ + l1sap.h \ + oap.h \ + oap_client.h \ + rsl.h \ + rxlev_stat.h \ + sysinfo.h \ + tlv.h \ + $(NULL) + +osmogsmdir = $(includedir)/osmocom/gsm + +noinst_HEADERS = \ + kasumi.h \ + gea.h \ + $(NULL) + +gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_header gsm \ + --target-path $(builddir)/ + +CLEANFILES = gsm0503.h diff --git a/include/osmocom/gsm/protocol/Makefile.am b/include/osmocom/gsm/protocol/Makefile.am new file mode 100644 index 0000000..2ce3139 --- /dev/null +++ b/include/osmocom/gsm/protocol/Makefile.am @@ -0,0 +1,28 @@ +osmogsmproto_HEADERS = \ + gsm_23_032.h \ + gsm_03_40.h \ + gsm_03_41.h \ + gsm_04_08.h \ + gsm_04_08_gprs.h \ + gsm_04_11.h \ + gsm_04_12.h \ + gsm_04_14.h \ + gsm_04_80.h \ + gsm_08_08.h \ + gsm_08_58.h \ + gsm_09_02.h \ + gsm_12_21.h \ + gsm_23_003.h \ + gsm_23_041.h \ + gsm_25_415.h \ + gsm_29_118.h \ + gsm_44_004.h \ + gsm_44_318.h \ + gsm_48_049.h \ + gsm_48_071.h \ + gsm_49_031.h \ + ipaccess.h \ + smpp34_osmocom.h \ + $(NULL) + +osmogsmprotodir = $(includedir)/osmocom/gsm/protocol diff --git a/include/osmocom/sim/Makefile.am b/include/osmocom/sim/Makefile.am new file mode 100644 index 0000000..bcc9459 --- /dev/null +++ b/include/osmocom/sim/Makefile.am @@ -0,0 +1,6 @@ +osmosim_HEADERS = \ + class_tables.h \ + sim.h + $(NULL) + +osmosimdir = $(includedir)/osmocom/sim diff --git a/include/osmocom/usb/Makefile.am b/include/osmocom/usb/Makefile.am new file mode 100644 index 0000000..3b2b8b4 --- /dev/null +++ b/include/osmocom/usb/Makefile.am @@ -0,0 +1,7 @@ +if ENABLE_LIBUSB +osmousb_HEADERS = \ + libusb.h \ + $(NULL) +endif + +osmousbdir = $(includedir)/osmocom/usb diff --git a/include/osmocom/vty/Makefile.am b/include/osmocom/vty/Makefile.am new file mode 100644 index 0000000..adb05dc --- /dev/null +++ b/include/osmocom/vty/Makefile.am @@ -0,0 +1,17 @@ +if ENABLE_VTY +osmovty_HEADERS = \ + buffer.h \ + command.h \ + logging.h \ + stats.h \ + misc.h \ + telnet_interface.h \ + vector.h \ + vty.h \ + ports.h \ + cpu_sched_vty.h \ + tdef_vty.h \ + $(NULL) +endif + +osmovtydir = $(includedir)/osmocom/vty -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I785891c2f89114bf8303c799094b637d3d25ac71 Gerrit-Change-Number: 31015 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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-MessageType: merged

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Fix all references to config.h

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31018 ) Change subject: Fix all references to config.h ...................................................................... Fix all references to config.h config.h is created in $(top_buildir)/config.h. Let's make sure all CPPFLAGS add correct -Ipath includes, and that all code includes the correct file. Change-Id: Ie9ea38bb009bc715b01cde4d66d181f7bec2e7bd --- M src/codec/Makefile.am M src/coding/Makefile.am M src/core/Makefile.am M src/core/gsmtap_util.c M src/core/it_q.c M src/core/logging.c M src/core/logging_gsmtap.c M src/core/logging_syslog.c M src/core/panic.c M src/core/plugin.c M src/core/select.c M src/core/socket.c M src/core/utils.c M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/gsm0411_utils.c M src/gsm/gsm_utils.c M src/gsm/kdf.c M src/gsm/mncc.c M src/pseudotalloc/Makefile.am M src/sim/Makefile.am M src/usb/Makefile.am M src/vty/Makefile.am M src/vty/cpu_sched_vty.c M src/vty/fsm_vty.c M src/vty/logging_vty.c M src/vty/stats_vty.c M tests/Makefile.am M tests/socket/socket_sctp_test.c M tests/socket/socket_test.c M tests/timer/timer_test.c M utils/osmo-stat-dummy/osmo-stat-dummy.c 32 files changed, 34 insertions(+), 32 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index c16ce9a..f05ac1f 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:1:3 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index d856918..42b16e8 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -5,7 +5,9 @@ AM_CPPFLAGS = \ -I"$(top_srcdir)/include" \ - -I"$(top_builddir)/include" + -I"$(top_builddir)/include" \ + -I"$(top_builddir)" \ + $(NULL) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 2cfb281..9b812ce 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=19:0:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) if ENABLE_PSEUDOTALLOC diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index 2571b85..cb7538b 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -19,7 +19,7 @@ * */ -#include "../config.h" +#include "config.h" #include <osmocom/core/gsmtap_util.h> #include <osmocom/core/logging.h> diff --git a/src/core/it_q.c b/src/core/it_q.c index fda6c1f..a3ff420 100644 --- a/src/core/it_q.c +++ b/src/core/it_q.c @@ -32,7 +32,7 @@ * and call a queue-specific callback function. */ -#include "../config.h" +#include "config.h" #ifdef HAVE_SYS_EVENTFD_H diff --git a/src/core/logging.c b/src/core/logging.c index ce42e4c..938c65f 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -25,7 +25,7 @@ * * \file logging.c */ -#include "../config.h" +#include "config.h" #include <stdarg.h> #include <stdlib.h> diff --git a/src/core/logging_gsmtap.c b/src/core/logging_gsmtap.c index cc95388..dfd059b 100644 --- a/src/core/logging_gsmtap.c +++ b/src/core/logging_gsmtap.c @@ -27,7 +27,7 @@ * @{ * \file logging_gsmtap.c */ -#include "../config.h" +#include "config.h" #include <stdarg.h> #include <stdlib.h> diff --git a/src/core/logging_syslog.c b/src/core/logging_syslog.c index 2090856..1153bdf 100644 --- a/src/core/logging_syslog.c +++ b/src/core/logging_syslog.c @@ -22,7 +22,7 @@ * @{ * \file logging_syslog.c */ -#include "../config.h" +#include "config.h" #ifdef HAVE_SYSLOG_H diff --git a/src/core/panic.c b/src/core/panic.c index 6c92522..bbf6d08 100644 --- a/src/core/panic.c +++ b/src/core/panic.c @@ -27,7 +27,7 @@ #include <osmocom/core/panic.h> #include <osmocom/core/backtrace.h> -#include "../config.h" +#include "config.h" static osmo_panic_handler_t osmo_panic_handler = (void*)0; diff --git a/src/core/plugin.c b/src/core/plugin.c index 5f44a40..687ad40 100644 --- a/src/core/plugin.c +++ b/src/core/plugin.c @@ -23,7 +23,7 @@ * @{ * \file plugin.c */ -#include "../config.h" +#include "config.h" #if HAVE_DLFCN_H diff --git a/src/core/select.c b/src/core/select.c index 026d457..72f794f 100644 --- a/src/core/select.c +++ b/src/core/select.c @@ -36,7 +36,7 @@ #include <osmocom/core/stat_item.h> #include <osmocom/core/stats_tcp.h> -#include "../config.h" +#include "config.h" #if defined(HAVE_SYS_SELECT_H) && defined(HAVE_POLL_H) #include <sys/select.h> diff --git a/src/core/socket.c b/src/core/socket.c index ee49c27..43736e0 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -17,7 +17,7 @@ * */ -#include "../config.h" +#include "config.h" /*! \addtogroup socket * @{ diff --git a/src/core/utils.c b/src/core/utils.c index 2012b74..231b65c 100644 --- a/src/core/utils.c +++ b/src/core/utils.c @@ -459,7 +459,7 @@ __attribute__((weak, alias("osmo_hexdump_nospc"))); #endif -#include "../config.h" +#include "config.h" #ifdef HAVE_CTYPE_H #include <ctype.h> /*! Convert an entire string to lower case diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 20de7d6..3134079 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=7:0:7 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_CTRL diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 32a03c8..1a26939 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=14:0:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall -fno-strict-aliasing \ $(TALLOC_CFLAGS) \ $(LIBMNL_CFLAGS) \ diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c index ccefe54..c26cd82 100644 --- a/src/gsm/gsm0411_utils.c +++ b/src/gsm/gsm0411_utils.c @@ -27,7 +27,7 @@ * */ -#include "../../config.h" +#include "config.h" #include <time.h> #include <string.h> diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index bbc7dd6..48341ae 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -92,7 +92,7 @@ #include <time.h> #include <unistd.h> -#include "../../config.h" +#include "config.h" #if (!EMBEDDED) /* FIXME: this can be removed once we bump glibc requirements to 2.25: */ diff --git a/src/gsm/kdf.c b/src/gsm/kdf.c index 6982f6f..4113aad 100644 --- a/src/gsm/kdf.c +++ b/src/gsm/kdf.c @@ -22,7 +22,7 @@ #include <stdint.h> #include <string.h> -#include "../../config.h" +#include "config.h" #if (USE_GNUTLS) #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/src/gsm/mncc.c b/src/gsm/mncc.c index 938cf9a..8a7dc4d 100644 --- a/src/gsm/mncc.c +++ b/src/gsm/mncc.c @@ -20,7 +20,7 @@ * */ -#include "../config.h" +#include "config.h" #ifdef HAVE_SYS_SOCKET_H diff --git a/src/pseudotalloc/Makefile.am b/src/pseudotalloc/Makefile.am index 1b86183..030b281 100644 --- a/src/pseudotalloc/Makefile.am +++ b/src/pseudotalloc/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall if ENABLE_PSEUDOTALLOC diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 51424c7..dee59bb 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:1:1 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am index b097aa7..c7d7a2a 100644 --- a/src/usb/Makefile.am +++ b/src/usb/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=0:1:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -fPIC -Wall $(LIBUSB_CFLAGS) $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index c2d133a..3da0919 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -3,7 +3,7 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=11:0:2 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) if ENABLE_VTY diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index 301e7a6..7198f74 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -25,7 +25,7 @@ #define _GNU_SOURCE -#include "../../config.h" +#include "config.h" #include <string.h> #include <stdlib.h> diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c index 777d38c..da6038f 100644 --- a/src/vty/fsm_vty.c +++ b/src/vty/fsm_vty.c @@ -19,7 +19,7 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" +#include "config.h" #include <osmocom/vty/command.h> #include <osmocom/vty/buffer.h> diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 59c8a9c..2a07422 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" +#include "config.h" #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 299ec24..f940018 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" +#include "config.h" #include <osmocom/vty/command.h> #include <osmocom/vty/buffer.h> diff --git a/tests/Makefile.am b/tests/Makefile.am index f0eaaca..78666e9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) AM_LDFLAGS = -no-install LDADD = $(top_builddir)/src/core/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS) diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c index b318fe5..e099be9 100644 --- a/tests/socket/socket_sctp_test.c +++ b/tests/socket/socket_sctp_test.c @@ -31,7 +31,7 @@ #include <osmocom/core/logging.h> #include <osmocom/core/bits.h> -#include "../config.h" +#include "config.h" void *ctx = NULL; diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index b3b9584..ddb6926 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -32,7 +32,7 @@ #include <osmocom/core/logging.h> #include <osmocom/core/bits.h> -#include "../config.h" +#include "config.h" void *ctx = NULL; diff --git a/tests/timer/timer_test.c b/tests/timer/timer_test.c index b06c774..9c51ad9 100644 --- a/tests/timer/timer_test.c +++ b/tests/timer/timer_test.c @@ -29,7 +29,7 @@ #include <osmocom/core/select.h> #include <osmocom/core/linuxlist.h> -#include "../config.h" +#include "config.h" static void main_timer_fired(void *data); static void secondary_timer_fired(void *data); diff --git a/utils/osmo-stat-dummy/osmo-stat-dummy.c b/utils/osmo-stat-dummy/osmo-stat-dummy.c index d8036e4..37da7b3 100644 --- a/utils/osmo-stat-dummy/osmo-stat-dummy.c +++ b/utils/osmo-stat-dummy/osmo-stat-dummy.c @@ -36,7 +36,7 @@ #include <osmocom/vty/stats.h> #include <osmocom/vty/misc.h> -#include "../../config.h" +#include "config.h" void *tall_statdummy_ctx = NULL; static bool quit = false; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9ea38bb009bc715b01cde4d66d181f7bec2e7bd Gerrit-Change-Number: 31018 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: isdndlc: Fix documentation

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30761 ) Change subject: isdndlc: Fix documentation ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/core/isdnhdlc.c: https://gerrit.osmocom.org/c/libosmocore/+/30761/comment/91a9a3ee_8ad35677 PS3, Line 94: The source buffer is scanned for valid HDLC frames looking for The lines do not start with a '*' Thats probably also why the linter goes haywire. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib5def2ae3c79f408f2ee0bb4c20fba1437d30c64 Gerrit-Change-Number: 30761 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 19 Jan 2023 11:45:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: lint: enable BRACES_NOT_NECESSARY check

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31020 ) Change subject: lint: enable BRACES_NOT_NECESSARY check ...................................................................... lint: enable BRACES_NOT_NECESSARY check As seen in code review here: https://gerrit.osmocom.org/c/libosmocore/+/30934 ... we do care about not using braces for single statement blocks. Let the linter comment on it. src/osmo_io.c:143: WARNING:BRACES_NOT_NECESSARY: braces {} are not necessary for single statement blocks src/osmo_io.c:271: WARNING:BRACES_NOT_NECESSARY: braces {} are not necessary for single statement blocks src/osmo_io.c:306: WARNING:BRACES_NOT_NECESSARY: braces {} are not necessary for single statement blocks src/osmo_io_poll.c:63: WARNING:BRACES_NOT_NECESSARY: braces {} are not necessary for single statement blocks src/osmo_io_poll.c:117: WARNING:BRACES_NOT_NECESSARY: braces {} are not necessary for single statement blocks Change-Id: I481d1b24a909173520a544ffd567bb8357729f2a --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index bc45f85..86d2fe1 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -53,7 +53,6 @@ # * ASSIGN_IN_IF: not followed (e.g. 'if ((u8 = gsup_msg->cause))') # * AVOID_EXTERNS: we do use externs # * BLOCK_COMMENT_STYLE: we don't use a trailing */ on a separate line -# * BRACES_NOT_NECESSARY: not followed # * COMPLEX_MACRO: we don't use parentheses when building macros of strings across multiple lines # * CONSTANT_COMPARISON: not followed: "Comparisons should place the constant on the right side" # * DEEP_INDENTATION: warns about many leading tabs, not useful if changing existing code without refactoring @@ -91,7 +90,6 @@ --ignore ASSIGN_IN_IF \ --ignore AVOID_EXTERNS \ --ignore BLOCK_COMMENT_STYLE \ - --ignore BRACES_NOT_NECESSARY \ --ignore COMPLEX_MACRO \ --ignore CONSTANT_COMPARISON \ --ignore DEEP_INDENTATION \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I481d1b24a909173520a544ffd567bb8357729f2a Gerrit-Change-Number: 31020 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: lint: enable BRACES_NOT_NECESSARY check

by dexter

Attention is currently required from: osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31020 ) Change subject: lint: enable BRACES_NOT_NECESSARY check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I481d1b24a909173520a544ffd567bb8357729f2a Gerrit-Change-Number: 31020 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Jan 2023 11:42:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Fix all references to config.h

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31018 ) Change subject: Fix all references to config.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9ea38bb009bc715b01cde4d66d181f7bec2e7bd Gerrit-Change-Number: 31018 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Jan 2023 11:37:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Makefile.am: Remove unexsiting all_includes variable

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31017 ) Change subject: Makefile.am: Remove unexsiting all_includes variable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bc7de6f85558e55265c6cc965bc7fe97a6736ee Gerrit-Change-Number: 31017 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Jan 2023 11:36:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023