March 2024 - gerrit-log - lists.osmocom.org

[XL] Change in mncc-python[master]: port over ctypeslib2

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/36319?usp=email ) Change subject: port over ctypeslib2 ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36319?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: I9efd56623ebeabef4317356a05484a620a3a91cc Gerrit-Change-Number: 36319 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 17 Mar 2024 08:19:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in mncc-python[master]: Initial port from python2 to python3

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/36318?usp=email ) Change subject: Initial port from python2 to python3 ...................................................................... Patch Set 3: Code-Review-1 (2 comments) File mncc_test.py: https://gerrit.osmocom.org/c/mncc-python/+/36318/comment/10277a07_86000a05 PS3, Line 72: return This is wrong, you need four more spaces. Otherwise the code below in unreachable. File rtpsource/Makefile: https://gerrit.osmocom.org/c/mncc-python/+/36318/comment/205ea397_4b12ed73 PS3, Line 2: lasan this looks unrelated to the py3 migration? -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ie6ecd37353b35a6ac13c6578585c714c9ab46e06 Gerrit-Change-Number: 36318 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 17 Mar 2024 08:16:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in mncc-python[master]: Adjust mncc_sock.py to MNCC v7 introducing sockaddr_storage

by laforge

Attention is currently required from: pespin. Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/mncc-python/+/36322?usp=email to look at the new patch set (#2). Change subject: Adjust mncc_sock.py to MNCC v7 introducing sockaddr_storage ...................................................................... Adjust mncc_sock.py to MNCC v7 introducing sockaddr_storage It seems that 4 years ago in 2020 we merged Change-Id Iab17f09380d7cd914cf85746b794c6c04ec7de43 to add MNCCv7 support, but never actually tested mncc_sock.py ever since, as it still tries to unconditionally access the 'ip' and 'port' members of the message, which no longer exist due to the introduction of sockaddr_storage. Working with sockaddr_storage is a bit nasty as it contains double-underscores in the __ss_padding member, which means ctypes/python will make it a private member that we cannot access. Work around this with a small sed-script that removes the underscores from the clang2py-generated python source code. Change-Id: I3aa267a866ffaa54e7d71c19231adc78d3831169 --- M mncc.py M mncc_sock.py M regen-mncc-py.sh 3 files changed, 55 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/22/36322/2 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36322?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: I3aa267a866ffaa54e7d71c19231adc78d3831169 Gerrit-Change-Number: 36322 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[XL] Change in mncc-python[master]: port over ctypeslib2

by laforge

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/mncc-python/+/36319?usp=email ) Change subject: port over ctypeslib2 ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36319?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: I9efd56623ebeabef4317356a05484a620a3a91cc Gerrit-Change-Number: 36319 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Mar 2024 22:11:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in mncc-python[master]: Adjust mncc_sock.py to MNCC v7 introducing sockaddr_storage

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/mncc-python/+/36322?usp=email ) Change subject: Adjust mncc_sock.py to MNCC v7 introducing sockaddr_storage ...................................................................... Adjust mncc_sock.py to MNCC v7 introducing sockaddr_storage It seems that 4 years ago in 2020 we merged Change-Id Iab17f09380d7cd914cf85746b794c6c04ec7de43 to add MNCCv7 support, but never actually tested mncc_sock.py ever since, as it still tries to unconditionally access the 'ip' and 'port' members of the message, which no longer exist due to the introduction of sockaddr_storage. Working with sockaddr_storage is a bit nasty as it contains double-underscores in the __ss_padding member, which means ctypes/python will make it a private member that we cannot access. Work around this with a small sed-script that removes the underscores from the clang2py-generated python source code. Change-Id: I3aa267a866ffaa54e7d71c19231adc78d3831169 --- M mncc.py M mncc_sock.py M regen-mncc-py.sh 3 files changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/22/36322/1 diff --git a/mncc.py b/mncc.py index f55b6c1..708b9b7 100644 --- a/mncc.py +++ b/mncc.py @@ -601,7 +601,7 @@ struct_sockaddr_storage._pack_ = 1 # source:False struct_sockaddr_storage._fields_ = [ ('ss_family', ctypes.c_uint16), - ('__ss_padding', ctypes.c_char * 118), + ('ss_padding', ctypes.c_char * 118), ('__ss_align', ctypes.c_uint64), ] diff --git a/mncc_sock.py b/mncc_sock.py index 79e2346..fd326a6 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -66,6 +66,23 @@ return "(???)" class mncc_rtp_msg(mncc.struct_gsm_mncc_rtp, mncc_msg_common): + @property + def ip(self): + assert self.addr.ss_family == 2 + return int.from_bytes(self.addr.ss_padding[2:6], 'big') + @ip.setter + def ip(self, val): + self.addr.ss_family = 2 + self.addr.ss_padding = self.addr.ss_padding[:2] + val.to_bytes(4, 'big') + self.addr.ss_padding[6:] + + @property + def port(self): + return int.from_bytes(self.addr.ss_padding[:2], 'big') + @port.setter + def port(self, val): + self.addr.ss_family = 2 + self.addr.ss_padding = val.to_bytes(2, 'big') + self.addr.ss_padding[2:] + def __str__(self): return 'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port) def __unicode__(self): diff --git a/regen-mncc-py.sh b/regen-mncc-py.sh index 08a92f1..4f9e3f3 100755 --- a/regen-mncc-py.sh +++ b/regen-mncc-py.sh @@ -4,3 +4,4 @@ echo clang2py -k ems -o mncc.py mncc.h +sed -e 's/__ss_padding/ss_padding/' -i mncc.py -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36322?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: I3aa267a866ffaa54e7d71c19231adc78d3831169 Gerrit-Change-Number: 36322 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in mncc-python[master]: Initial port from python2 to python3

by laforge

Attention is currently required from: fixeria, osmith, pespin. Hello fixeria, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/mncc-python/+/36318?usp=email to look at the new patch set (#3). Change subject: Initial port from python2 to python3 ...................................................................... Initial port from python2 to python3 This is a very crude port, including manual edits to the ctypeslib-generated mncc.py file. There's no real clean way to do this, as ctypeslib is ancient, abandoned and unmaintained. Change-Id: Ie6ecd37353b35a6ac13c6578585c714c9ab46e06 --- M mncc.py M mncc_mt_loadgen.py M mncc_sock.py M mncc_test.py M rtpsource/Makefile M smpp_test.py 6 files changed, 62 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/18/36318/3 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ie6ecd37353b35a6ac13c6578585c714c9ab46e06 Gerrit-Change-Number: 36318 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[M] Change in osmo-bts[master]: osmo-bts-virtual: Port over to osmo_io

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/36317?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: osmo-bts-virtual: Port over to osmo_io ...................................................................... osmo-bts-virtual: Port over to osmo_io osmo_io permits us to use the io_uring backend, which should significantly speed up the many small read/writes we're doing on virt-um. Change-Id: Icfe42da00fd446c38090055e2baa5d5e0ae5b70c --- M src/osmo-bts-virtual/osmo_mcast_sock.c M src/osmo-bts-virtual/osmo_mcast_sock.h M src/osmo-bts-virtual/scheduler_virtbts.c M src/osmo-bts-virtual/virtual_um.c 4 files changed, 113 insertions(+), 91 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/36317/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36317?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icfe42da00fd446c38090055e2baa5d5e0ae5b70c Gerrit-Change-Number: 36317 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[M] Change in mncc-python[master]: Initial port from python2 to python3

by laforge

laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/mncc-python/+/36318?usp=email ) Change subject: Initial port from python2 to python3 ...................................................................... Initial port from python2 to python3 This is a very crude port, including manual edits to the ctypeslib-generated mncc.py file. There's no real clean way to do this, as ctypeslib is ancient, abandoned and unmaintained. Change-Id: Ie6ecd37353b35a6ac13c6578585c714c9ab46e06 --- M mncc.py M mncc_mt_loadgen.py M mncc_sock.py M mncc_test.py M rtpsource/Makefile M smpp_test.py 6 files changed, 60 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/18/36318/2 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ie6ecd37353b35a6ac13c6578585c714c9ab46e06 Gerrit-Change-Number: 36318 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in mncc-python[master]: update to MNCC V8 support

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/mncc-python/+/36320?usp=email ) Change subject: update to MNCC V8 support ...................................................................... update to MNCC V8 support This updates the mncc.h to V8 with GCR support, as introduced in Change-ID I705c860e51637b4537cad65a330ecbaaca96dd5b of osmo-msc Change-Id: Ia27956e42c6c2f494d59b89f42345462c86b10d2 --- M mncc.h M mncc.py 2 files changed, 39 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/20/36320/1 diff --git a/mncc.h b/mncc.h index 394399f..ee8b1d7 100644 --- a/mncc.h +++ b/mncc.h @@ -1,7 +1,7 @@ /* This file contains sections copied from * libosmocore/include/osmocom/gsm/protocol/gsm_04_08.h, * libosmocore/include/osmocom/gsm/mncc.h and - * openbsc/include/openbsc/mncc.h + * osmo-msc/include/osmocom/msc/mncc.h */ #include <stdint.h> @@ -114,6 +114,15 @@ GSM48_BCAP_SV_AMR_OH = 11, /*!< GSM HR V6 (OHR AMR) */ }; +/*! Parsed representation of Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1. */ +struct osmo_gcr_parsed { + uint8_t net[5]; /** Network ID, ITU-T Q.1902.3 */ + uint8_t net_len; /** length (3-5 octets) of gsm29205_gcr#net */ + uint16_t node; /** Node ID */ + uint8_t cr[5]; /** Call Reference ID */ +}; + + #define GSM_MAX_FACILITY 128 #define GSM_MAX_SSVERSION 128 @@ -308,6 +317,7 @@ unsigned char lchan_type; unsigned char lchan_mode; + struct osmo_gcr_parsed gcr; char sdp[1024]; }; @@ -317,7 +327,7 @@ unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 7 +#define MNCC_SOCK_VERSION 8 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; diff --git a/mncc.py b/mncc.py index e22fb74..9f95a71 100644 --- a/mncc.py +++ b/mncc.py @@ -188,7 +188,7 @@ MNCC_F_CCCAP = 0x0800 # macro MNCC_F_KEYPAD = 0x1000 # macro MNCC_F_SIGNAL = 0x2000 # macro -MNCC_SOCK_VERSION = 7 # macro +MNCC_SOCK_VERSION = 8 # macro # values for enumeration 'gsm48_bcap_itcap' gsm48_bcap_itcap__enumvalues = { @@ -365,6 +365,18 @@ GSM48_BCAP_SV_AMR_FW = 8 GSM48_BCAP_SV_AMR_OH = 11 gsm48_bcap_speech_ver = ctypes.c_uint32 # enum +class struct_osmo_gcr_parsed(Structure): + pass + +struct_osmo_gcr_parsed._pack_ = 1 # source:False +struct_osmo_gcr_parsed._fields_ = [ + ('net', ctypes.c_ubyte * 5), + ('net_len', ctypes.c_ubyte), + ('node', ctypes.c_uint16), + ('cr', ctypes.c_ubyte * 5), + ('PADDING_0', ctypes.c_ubyte), +] + class struct_gsm_mncc_bearer_cap(Structure): pass @@ -524,8 +536,8 @@ ('imsi', ctypes.c_char * 16), ('lchan_type', ctypes.c_ubyte), ('lchan_mode', ctypes.c_ubyte), + ('gcr', struct_osmo_gcr_parsed), ('sdp', ctypes.c_char * 1024), - ('PADDING_0', ctypes.c_ubyte * 2), ] class struct_gsm_data_frame(Structure): @@ -651,4 +663,4 @@ 'struct_gsm_mncc_hello', 'struct_gsm_mncc_number', 'struct_gsm_mncc_progress', 'struct_gsm_mncc_rtp', 'struct_gsm_mncc_ssversion', 'struct_gsm_mncc_useruser', - 'struct_sockaddr_storage'] + 'struct_osmo_gcr_parsed', 'struct_sockaddr_storage'] -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36320?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ia27956e42c6c2f494d59b89f42345462c86b10d2 Gerrit-Change-Number: 36320 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in mncc-python[master]: Initial port from python2 to python3

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/mncc-python/+/36318?usp=email ) Change subject: Initial port from python2 to python3 ...................................................................... Initial port from python2 to python3 This is a very crude port, including manual edits to the ctypeslib-generated mncc.py file. There's no real clean way to do this, as ctypeslib is ancient, abandoned and unmaintained. Change-Id: Ie6ecd37353b35a6ac13c6578585c714c9ab46e06 --- M mncc.py M mncc_test.py M rtpsource/Makefile 3 files changed, 55 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/18/36318/1 diff --git a/mncc.py b/mncc.py index 58e1351..6a30eaa 100644 --- a/mncc.py +++ b/mncc.py @@ -383,7 +383,7 @@ PF_X25 = 9 # Variable c_int '9' IP_UNICAST_IF = 50 # Variable c_int '50' IP_RECVERR = 11 # Variable c_int '11' -IN_CLASSA_HOST = 16777215L # Variable c_uint '16777215u' +IN_CLASSA_HOST = 16777215 # Variable c_uint '16777215u' __time_t_defined = 1 # Variable c_int '1' INT_LEAST16_MAX = 32767 # Variable c_int '32767' __NFDBITS = 64 # Variable c_int '64' @@ -428,12 +428,12 @@ __GLIBC_USE_LIB_EXT2 = 1 # Variable c_int '1' INET_ADDRSTRLEN = 16 # Variable c_int '16' SO_DETACH_REUSEPORT_BPF = 68 # Variable c_int '68' -INADDR_BROADCAST = 4294967295L # Variable c_uint '4294967295u' +INADDR_BROADCAST = 4294967295 # Variable c_uint '4294967295u' WCHAR_WIDTH = 32 # Variable c_int '32' INTPTR_MIN = -9223372036854775808 # Variable c_long '-0x08000000000000000l' PF_MPLS = 28 # Variable c_int '28' _ENDIAN_H = 1 # Variable c_int '1' -INADDR_ALLSNOOPERS_GROUP = 3758096490L # Variable c_uint '3758096490u' +INADDR_ALLSNOOPERS_GROUP = 3758096490 # Variable c_uint '3758096490u' FIOGETOWN = 35075 # Variable c_int '35075' MCAST_JOIN_GROUP = 42 # Variable c_int '42' __USE_FORTIFY_LEVEL = 0 # Variable c_int '0' @@ -450,14 +450,14 @@ PF_IUCV = 32 # Variable c_int '32' MNCC_REJ_IND = 296 # Variable c_int '296' PF_APPLETALK = 5 # Variable c_int '5' -UINTMAX_MAX = 18446744073709551615L # Variable c_ulong '-1ul' +UINTMAX_MAX = 18446744073709551615 # Variable c_ulong '-1ul' IPV6_PMTUDISC_PROBE = 3 # Variable c_int '3' PF_VSOCK = 40 # Variable c_int '40' MNCC_SETUP_COMPL_REQ = 261 # Variable c_int '261' IPV6_DONTFRAG = 62 # Variable c_int '62' SOL_PACKET = 263 # Variable c_int '263' MNCC_START_DTMF_IND = 277 # Variable c_int '277' -UINT_FAST16_MAX = 18446744073709551615L # Variable c_ulong '-1ul' +UINT_FAST16_MAX = 18446744073709551615 # Variable c_ulong '-1ul' __WORDSIZE = 64 # Variable c_int '64' UINT_FAST64_WIDTH = 64 # Variable c_int '64' MNCC_FRAME_DROP = 514 # Variable c_int '514' @@ -465,7 +465,7 @@ INT_FAST8_MIN = -128 # Variable c_int '-0x00000000000000080' _XOPEN_SOURCE = 700 # Variable c_int '700' SO_KEEPALIVE = 9 # Variable c_int '9' -WINT_MIN = 0L # Variable c_uint '0u' +WINT_MIN = 0 # Variable c_uint '0u' __USE_ISOC95 = 1 # Variable c_int '1' IN_CLASSA_MAX = 128 # Variable c_int '128' MNCC_ALERT_IND = 267 # Variable c_int '267' @@ -486,7 +486,7 @@ UINT8_MAX = 255 # Variable c_int '255' SOL_NETBEUI = 267 # Variable c_int '267' SO_BUSY_POLL = 46 # Variable c_int '46' -IN_CLASSB_HOST = 65535L # Variable c_uint '65535u' +IN_CLASSB_HOST = 65535 # Variable c_uint '65535u' __USE_XOPEN = 1 # Variable c_int '1' PF_ROSE = 11 # Variable c_int '11' IPV6_ADDRFORM = 1 # Variable c_int '1' @@ -506,7 +506,7 @@ IPV6_2292PKTINFO = 2 # Variable c_int '2' SO_TIMESTAMPNS_NEW = 64 # Variable c_int '64' SO_PRIORITY = 12 # Variable c_int '12' -UINT64_MAX = 18446744073709551615L # Variable c_ulong '-1ul' +UINT64_MAX = 18446744073709551615 # Variable c_ulong '-1ul' SO_INCOMING_CPU = 49 # Variable c_int '49' IN_CLASSB_MAX = 65536 # Variable c_int '65536' SO_LINGER = 13 # Variable c_int '13' @@ -537,7 +537,7 @@ INT64_MIN = -9223372036854775808 # Variable c_long '-0x08000000000000000l' IPV6_IPSEC_POLICY = 34 # Variable c_int '34' SO_ZEROCOPY = 60 # Variable c_int '60' -__SOCKADDR_COMMON_SIZE = 2L # Variable c_ulong '2ul' +__SOCKADDR_COMMON_SIZE = 2 # Variable c_ulong '2ul' __clockid_t_defined = 1 # Variable c_int '1' SO_ACCEPTCONN = 30 # Variable c_int '30' IP_MULTICAST_LOOP = 34 # Variable c_int '34' @@ -578,9 +578,9 @@ _BITS_ENDIAN_H = 1 # Variable c_int '1' SO_CNX_ADVICE = 53 # Variable c_int '53' INT8_MIN = -128 # Variable c_int '-0x00000000000000080' -UINT_LEAST64_MAX = 18446744073709551615L # Variable c_ulong '-1ul' +UINT_LEAST64_MAX = 18446744073709551615 # Variable c_ulong '-1ul' IP_BLOCK_SOURCE = 38 # Variable c_int '38' -UINT_FAST64_MAX = 18446744073709551615L # Variable c_ulong '-1ul' +UINT_FAST64_MAX = 18446744073709551615 # Variable c_ulong '-1ul' SOL_ATM = 264 # Variable c_int '264' __SIZEOF_PTHREAD_RWLOCK_T = 56 # Variable c_int '56' _THREAD_SHARED_TYPES_H = 1 # Variable c_int '1' @@ -615,7 +615,7 @@ PF_LOCAL = 1 # Variable c_int '1' MNCC_RETRIEVE_CNF = 291 # Variable c_int '291' MNCC_F_EMERGENCY = 256 # Variable c_int '256' -INADDR_ALLHOSTS_GROUP = 3758096385L # Variable c_uint '3758096385u' +INADDR_ALLHOSTS_GROUP = 3758096385 # Variable c_uint '3758096385u' MNCC_REJ_REQ = 295 # Variable c_int '295' IPV6_TCLASS = 67 # Variable c_int '67' INT_FAST8_MAX = 127 # Variable c_int '127' @@ -629,7 +629,7 @@ PF_IB = 27 # Variable c_int '27' IP_MULTICAST_TTL = 33 # Variable c_int '33' MNCC_CALL_PROC_REQ = 264 # Variable c_int '264' -WINT_MAX = 4294967295L # Variable c_uint '4294967295u' +WINT_MAX = 4294967295 # Variable c_uint '4294967295u' SIOCGPGRP = 35076 # Variable c_int '35076' _BITS_STDINT_UINTN_H = 1 # Variable c_int '1' IP_ADD_MEMBERSHIP = 35 # Variable c_int '35' @@ -650,7 +650,7 @@ PF_NFC = 39 # Variable c_int '39' IPV6_LEAVE_ANYCAST = 28 # Variable c_int '28' GSM_TCHF_FRAME_EFR = 769 # Variable c_int '769' -IN_CLASSA_NET = 4278190080L # Variable c_uint '4278190080u' +IN_CLASSA_NET = 4278190080 # Variable c_uint '4278190080u' SOL_TIPC = 271 # Variable c_int '271' IPV6_MULTICAST_IF = 17 # Variable c_int '17' MNCC_NOTIFY_IND = 269 # Variable c_int '269' @@ -669,15 +669,15 @@ SO_BSDCOMPAT = 14 # Variable c_int '14' __RLIM_T_MATCHES_RLIM64_T = 1 # Variable c_int '1' MNCC_DISC_REQ = 270 # Variable c_int '270' -IN_CLASSC_HOST = 255L # Variable c_uint '255u' +IN_CLASSC_HOST = 255 # Variable c_uint '255u' PF_RXRPC = 33 # Variable c_int '33' __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI = 0 # Variable c_int '0' -UINT_LEAST32_MAX = 4294967295L # Variable c_uint '4294967295u' +UINT_LEAST32_MAX = 4294967295 # Variable c_uint '4294967295u' __GLIBC_USE_IEC_60559_TYPES_EXT = 1 # Variable c_int '1' SO_SNDBUF = 7 # Variable c_int '7' SO_PEEK_OFF = 42 # Variable c_int '42' WINT_WIDTH = 32 # Variable c_int '32' -UINT32_MAX = 4294967295L # Variable c_uint '4294967295u' +UINT32_MAX = 4294967295 # Variable c_uint '4294967295u' MNCC_F_PROGRESS = 128 # Variable c_int '128' MNCC_HOLD_REJ = 289 # Variable c_int '289' IPV6_UNICAST_HOPS = 16 # Variable c_int '16' @@ -690,7 +690,7 @@ IP_FREEBIND = 15 # Variable c_int '15' __USE_XOPEN2K = 1 # Variable c_int '1' __FD_SETSIZE = 1024 # Variable c_int '1024' -INADDR_ALLRTRS_GROUP = 3758096386L # Variable c_uint '3758096386u' +INADDR_ALLRTRS_GROUP = 3758096386 # Variable c_uint '3758096386u' SIOCATMARK = 35077 # Variable c_int '35077' IPV6_PKTINFO = 50 # Variable c_int '50' UINTMAX_WIDTH = 64 # Variable c_int '64' @@ -701,14 +701,14 @@ SO_NO_CHECK = 11 # Variable c_int '11' __GLIBC_USE_ISOC2X = 1 # Variable c_int '1' SOL_ICMPV6 = 58 # Variable c_int '58' -UINTPTR_MAX = 18446744073709551615L # Variable c_ulong '-1ul' +UINTPTR_MAX = 18446744073709551615 # Variable c_ulong '-1ul' IPV6_ROUTER_ALERT = 22 # Variable c_int '22' __SIZEOF_PTHREAD_BARRIERATTR_T = 4 # Variable c_int '4' INT16_MIN = -32768 # Variable c_int '-0x00000000000008000' MNCC_RETRIEVE_REJ = 292 # Variable c_int '292' SO_TXTIME = 61 # Variable c_int '61' UINT8_WIDTH = 8 # Variable c_int '8' -IN_CLASSC_NET = 4294967040L # Variable c_uint '4294967040u' +IN_CLASSC_NET = 4294967040 # Variable c_uint '4294967040u' INT_LEAST64_MAX = 9223372036854775807 # Variable c_long '9223372036854775807l' PF_INET = 2 # Variable c_int '2' IPV6_MULTICAST_HOPS = 18 # Variable c_int '18' @@ -719,7 +719,7 @@ SOL_DECNET = 261 # Variable c_int '261' PF_KCM = 41 # Variable c_int '41' MNCC_F_CONNECTED = 16 # Variable c_int '16' -IN_CLASSB_NET = 4294901760L # Variable c_uint '4294901760u' +IN_CLASSB_NET = 4294901760 # Variable c_uint '4294901760u' _STDINT_H = 1 # Variable c_int '1' __PTHREAD_MUTEX_HAVE_PREV = 1 # Variable c_int '1' PF_KEY = 15 # Variable c_int '15' @@ -735,7 +735,7 @@ SO_TIMESTAMPING_OLD = 37 # Variable c_int '37' IPV6_CHECKSUM = 7 # Variable c_int '7' MNCC_USERINFO_IND = 294 # Variable c_int '294' -UINT_FAST32_MAX = 18446744073709551615L # Variable c_ulong '-1ul' +UINT_FAST32_MAX = 18446744073709551615 # Variable c_ulong '-1ul' SO_SNDTIMEO_NEW = 67 # Variable c_int '67' IPV6_PMTUDISC_OMIT = 5 # Variable c_int '5' SIG_ATOMIC_MIN = -2147483648 # Variable c_int '-0x00000000080000000' @@ -762,7 +762,7 @@ MNCC_MODIFY_RSP = 284 # Variable c_int '284' MNCC_SETUP_RSP = 259 # Variable c_int '259' SO_PROTOCOL = 38 # Variable c_int '38' -SIZE_MAX = 18446744073709551615L # Variable c_ulong '-1ul' +SIZE_MAX = 18446744073709551615 # Variable c_ulong '-1ul' UINT_LEAST16_MAX = 65535 # Variable c_int '65535' SOL_KCM = 281 # Variable c_int '281' SO_TIMESTAMP_OLD = 29 # Variable c_int '29' @@ -791,7 +791,7 @@ IP_PMTUDISC_PROBE = 3 # Variable c_int '3' SO_MAX_PACING_RATE = 47 # Variable c_int '47' _BITS_UINTN_IDENTITY_H = 1 # Variable c_int '1' -_SS_PADSIZE = 118L # Variable c_ulong '118ul' +_SS_PADSIZE = 118 # Variable c_ulong '118ul' IP_IPSEC_POLICY = 16 # Variable c_int '16' MNCC_SOCK_VERSION = 7 # Variable c_int '7' SCM_TIMESTAMPING_OPT_STATS = 54 # Variable c_int '54' @@ -805,7 +805,7 @@ SO_SNDBUFFORCE = 32 # Variable c_int '32' _ISOC99_SOURCE = 1 # Variable c_int '1' MCAST_INCLUDE = 1 # Variable c_int '1' -INADDR_LOOPBACK = 2130706433L # Variable c_uint '2130706433u' +INADDR_LOOPBACK = 2130706433 # Variable c_uint '2130706433u' PF_PACKET = 17 # Variable c_int '17' PF_ATMPVC = 8 # Variable c_int '8' __clock_t_defined = 1 # Variable c_int '1' @@ -823,7 +823,7 @@ __BIT_TYPES_DEFINED__ = 1 # Variable c_int '1' SO_BPF_EXTENSIONS = 48 # Variable c_int '48' IP_DEFAULT_MULTICAST_TTL = 1 # Variable c_int '1' -INADDR_NONE = 4294967295L # Variable c_uint '4294967295u' +INADDR_NONE = 4294967295 # Variable c_uint '4294967295u' IPV6_V6ONLY = 26 # Variable c_int '26' SOMAXCONN = 4096 # Variable c_int '4096' SO_RXQ_OVFL = 40 # Variable c_int '40' @@ -836,7 +836,7 @@ _BITS_SOCKADDR_H = 1 # Variable c_int '1' MNCC_FRAME_RECV = 513 # Variable c_int '513' IPV6_ROUTER_ALERT_ISOLATE = 30 # Variable c_int '30' -INADDR_UNSPEC_GROUP = 3758096384L # Variable c_uint '3758096384u' +INADDR_UNSPEC_GROUP = 3758096384 # Variable c_uint '3758096384u' SOL_RAW = 255 # Variable c_int '255' _ISOC11_SOURCE = 1 # Variable c_int '1' IPV6_TRANSPARENT = 75 # Variable c_int '75' @@ -848,7 +848,7 @@ IPV6_2292HOPLIMIT = 8 # Variable c_int '8' IN_LOOPBACKNET = 127 # Variable c_int '127' UINT_FAST8_WIDTH = 8 # Variable c_int '8' -INADDR_MAX_LOCAL_GROUP = 3758096639L # Variable c_uint '3758096639u' +INADDR_MAX_LOCAL_GROUP = 3758096639 # Variable c_uint '3758096639u' SOL_IP = 0 # Variable c_int '0' IP_XFRM_POLICY = 17 # Variable c_int '17' SO_PEERGROUPS = 59 # Variable c_int '59' @@ -856,7 +856,7 @@ PF_BRIDGE = 7 # Variable c_int '7' PF_XDP = 44 # Variable c_int '44' INT_LEAST32_MIN = -2147483648 # Variable c_int '-0x00000000080000000' -INADDR_ANY = 0L # Variable c_uint '0u' +INADDR_ANY = 0 # Variable c_uint '0u' _THREAD_MUTEX_INTERNAL_H = 1 # Variable c_int '1' UINT_LEAST8_MAX = 255 # Variable c_int '255' MNCC_HOLD_IND = 287 # Variable c_int '287' @@ -891,7 +891,7 @@ _LARGEFILE64_SOURCE = 1 # Variable c_int '1' __OFF_T_MATCHES_OFF64_T = 1 # Variable c_int '1' IPV6_XFRM_POLICY = 35 # Variable c_int '35' -_SIGSET_NWORDS = 16L # Variable c_ulong '16ul' +_SIGSET_NWORDS = 16 # Variable c_ulong '16ul' PF_WANPIPE = 25 # Variable c_int '25' IPV6_RECVTCLASS = 66 # Variable c_int '66' SO_DOMAIN = 39 # Variable c_int '39' diff --git a/mncc_test.py b/mncc_test.py index 1fe0fca..3685378 100755 --- a/mncc_test.py +++ b/mncc_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # Python testing tool for establishing calls via the OsmoNITB MNCC # interface. @@ -11,7 +11,7 @@ from gsm_call_fsm import GsmCallFsm, GsmCallConnector, GSM48 from mncc_sock import MnccSocket -from thread import start_new_thread +import threading import pykka import logging as log import signal, sys, time @@ -57,7 +57,7 @@ # start the MnccSocket and associated pykka actor + rx thread mncc_sock = MnccSocket() mncc_act = MnccActor.start(mncc_sock) -start_new_thread(mncc_rx_thread, (mncc_sock,)) +threading.Thread(target=mncc_rx_thread, args=(mncc_sock,)) # convenience wrapper def connect_call(msisdn_a, msisdn_b, rtp_bridge = True, codecs = GSM48.AllCodecs): @@ -68,16 +68,16 @@ def calls(nr, ramp=1.0): if (nr & 1): print('Only even numbers allowed, because each invocation has two call legs') - return + return nr /= 2 for i in range(nr): - a = 90001 + 2*i - b = a + 1 - a = str(a) - b = str(b) - print('%d: connect_call(%r, %r)' % (i, a, b)) - connect_call(a, b) - time.sleep(ramp) + a = 90001 + 2*i + b = a + 1 + a = str(a) + b = str(b) + print('%d: connect_call(%r, %r)' % (i, a, b)) + connect_call(a, b) + time.sleep(ramp) # start a first bogus call diff --git a/rtpsource/Makefile b/rtpsource/Makefile index 2ede792..5c01adb 100644 --- a/rtpsource/Makefile +++ b/rtpsource/Makefile @@ -1,5 +1,5 @@ OSMO_CFLAGS:=$(shell pkg-config --cflags libosmocore libosmoctrl libosmotrau) -OSMO_LIBS:=$(shell pkg-config --libs libosmocore libosmoctrl libosmotrau) +OSMO_LIBS:=-lasan $(shell pkg-config --libs libosmocore libosmoctrl libosmotrau) CFLAGS:= -g -Wall $(OSMO_CFLAGS) LIBS:= $(OSMO_LIBS) -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: Ie6ecd37353b35a6ac13c6578585c714c9ab46e06 Gerrit-Change-Number: 36318 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024