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

[S] Change in libosmo-sccp[master]: cosmetic: add spec reference

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29158?usp=email ) Change subject: cosmetic: add spec reference ...................................................................... Patch Set 2: (1 comment) File src/sua.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/29158/comment/32d0d707_983098d0 PS1, Line 184: /* ITU-T Rec Q.713 */ > Background: SUA is a (much younger, IETF-provided) alternative protocol for (SCCP+MTP). […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29158?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4d6bf9d0e681db779770b2fb815f7f9c5e608b15 Gerrit-Change-Number: 29158 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 09:11:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: docs: shell: link to cmd2 documentation

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34937?usp=email ) Change subject: docs: shell: link to cmd2 documentation ...................................................................... Patch Set 2: (1 comment) File docs/shell.rst: https://gerrit.osmocom.org/c/pysim/+/34937/comment/13cfb7bc_e069cfe4 PS1, Line 53: As pySim-shell is built upon ``cmd``, some generic cmd2 commands/features are available. You may > upon cmd2? Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34937?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I532cb33781f95fe847db7fae7a5264b5d9c416de Gerrit-Change-Number: 34937 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 09:11:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: gsmtap-rlp: Add support for skipping generating NULL frames

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35133?usp=email ) Change subject: gsmtap-rlp: Add support for skipping generating NULL frames ...................................................................... Patch Set 7: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/35133/comment/9b342e3b_57702e1a PS5, Line 13: I85a2159cfaa01bfb4205c1462e3a9dbda68e4bad > `Depends: libosmocore. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35133?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: I85a2159cfaa01bfb4205c1462e3a9dbda68e4bad Gerrit-Change-Number: 35133 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 09:11:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: input/ipaccess: fix regression in ipaccess_bts_handle_ccm()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email ) Change subject: input/ipaccess: fix regression in ipaccess_bts_handle_ccm() ...................................................................... Patch Set 1: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/36100/comment/8df5b4a3_a7281a2a PS1, Line 897: LOGP(DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", > maybe printing information about the link instead would be welcome. I agree, we should provide context. but let's fix the regression first. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic26181b580724a70c2af8a224155430902fe4101 Gerrit-Change-Number: 36100 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 09:11:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Add osmo_io_get_ioops() function

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36076?usp=email ) Change subject: osmo_io: Add osmo_io_get_ioops() function ...................................................................... Patch Set 2: (1 comment) File include/osmocom/core/osmo_io.h: https://gerrit.osmocom.org/c/libosmocore/+/36076/comment/2c35a904_8bbce55a PS1, Line 112: void osmo_iofd_get_ioops(struct osmo_io_fd *iofd, struct osmo_io_ops *ioops); > Yeah well you can even do address calculation to change stuff even if you don't get the pointer, but […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36076?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I03398c811b9534f50c6644b21eea89a04be29fb0 Gerrit-Change-Number: 36076 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 09:11:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jenkins: Add io_uring job for osmo-mgw

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36365?usp=email ) Change subject: jenkins: Add io_uring job for osmo-mgw ...................................................................... jenkins: Add io_uring job for osmo-mgw A change introducing osmo_io for RTP/RTCP of omo-mgw is currently in review at https://gerrit.osmocom.org/c/osmo-mgw/+/36363 Let's make sure we have a related io_uring test job. Change-Id: I672c72c855bebc1f895be51f3fa3cf0e368005ff Related: OS#6387, SYS#5094 --- M jobs/ttcn3-testsuites.yml 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/65/36365/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 71bcb81..8b5ad09 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -223,6 +223,9 @@ - ttcn3-stp-test-io_uring: timer: H 11 * * * node: ttcn3-io_uring + - ttcn3-mgw-test-io_uring: + timer: H 11 * * * + node: ttcn3-io_uring - job-template: name: '{job-name}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36365?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I672c72c855bebc1f895be51f3fa3cf0e368005ff Gerrit-Change-Number: 36365 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-remsim[master]: debian/rules: don't compress pdfs

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36359?usp=email ) Change subject: debian/rules: don't compress pdfs ...................................................................... debian/rules: don't compress pdfs Adjust debian packaging as in other Osmocom projects to not compress the pdf files. Related: SYS#6855 Change-Id: I4372c2d93b317a9deaed3650941c7438accf9211 --- M debian/rules 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/debian/rules b/debian/rules index fddb043..779d944 100755 --- a/debian/rules +++ b/debian/rules @@ -25,3 +25,7 @@ # Print test results in case of a failure #override_dh_auto_test: # dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +# Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers) +override_dh_compress: + dh_compress -X.pdf -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36359?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I4372c2d93b317a9deaed3650941c7438accf9211 Gerrit-Change-Number: 36359 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[M] Change in libosmo-abis[master]: Fix critical bug in default TCP keepalive user timeout

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36079?usp=email ) Change subject: Fix critical bug in default TCP keepalive user timeout ...................................................................... Patch Set 4: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/36079/comment/e0eb58fe_e94e9e72 PS3, Line 613: uesr_timeout > user_timeout Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Idca24d3e676a45d860d9eec60dc2097d8d87f3bf Gerrit-Change-Number: 36079 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-Comment-Date: Wed, 20 Mar 2024 09:07:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-remsim[master]: debian/rules: don't compress pdfs

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36359?usp=email ) Change subject: debian/rules: don't compress pdfs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36359?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I4372c2d93b317a9deaed3650941c7438accf9211 Gerrit-Change-Number: 36359 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 07:44:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Change msgb ownership in processing of received msgb

by fixeria

Attention is currently required from: dexter, laforge, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36361?usp=email ) Change subject: Change msgb ownership in processing of received msgb ...................................................................... Patch Set 2: (4 comments) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/36361/comment/054b7bba_98b3a44e PS2, Line 1191: return rc missing `msgb_free()`? https://gerrit.osmocom.org/c/osmo-mgw/+/36361/comment/2e47f083_0389a5bc PS2, Line 1205: return rc missing `msgb_free()`? https://gerrit.osmocom.org/c/osmo-mgw/+/36361/comment/949625fb_1bc94e6f PS2, Line 1212: return rc missing `msgb_free()`? File src/libosmo-mgcp/mgcp_osmux.c: https://gerrit.osmocom.org/c/osmo-mgw/+/36361/comment/e31c09c9_cb3f3273 PS2, Line 217: return -1; missing `msgb_free()` here and below? AFAIU, if a function claims to take ownership, then it's also responsible for `free()`ing it in all error paths? If not, this should be clarified in the docs above. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36361?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6a331f3c6b2eb51ea312ac6ef8c357185ddb79cf Gerrit-Change-Number: 36361 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 07:36:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: remove osmo_fd from mgcp_create_bind()

by fixeria

Attention is currently required from: dexter, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36360?usp=email ) Change subject: remove osmo_fd from mgcp_create_bind() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/36360/comment/13d723a2_73c3fcfb PS1, Line 1523: returns 0 on success, -1 on ERROR this needs to be updated: `\returns a file descriptor; negative on error` -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36360?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4a3b66a14fdfbc867daca0f0a05f694d5e0d7b66 Gerrit-Change-Number: 36360 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 07:27:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: don't log useless "transcoding disabled" message

by fixeria

Attention is currently required from: dexter, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36358?usp=email ) Change subject: don't log useless "transcoding disabled" message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36358?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If0ee2607404afc3a00665a5cf22a9e0eb62eb476 Gerrit-Change-Number: 36358 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 07:20:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: simplify unused transcoding/processing call-back

by fixeria

Attention is currently required from: dexter, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36357?usp=email ) Change subject: simplify unused transcoding/processing call-back ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36357?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I002624f9008726e3d754d48aa2282c38e3b42953 Gerrit-Change-Number: 36357 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 07:20:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: remove strange loop for non-existant transcoding support

by fixeria

Attention is currently required from: dexter, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36356?usp=email ) Change subject: remove strange loop for non-existant transcoding support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36356?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie1a629fd31c5ab806fc929d1e6b279c4be5b8246 Gerrit-Change-Number: 36356 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 07:18:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: Add our usual SIGABRT, SIGUSR1 signal handlers

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36355?usp=email ) Change subject: mgw: Add our usual SIGABRT, SIGUSR1 signal handlers ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idc35444d2b8a0bc52c267b468dfa3c1b59f9187a Gerrit-Change-Number: 36355 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 07:17:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: HACK: Allow io_uring_submit batching just ahead of poll

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36364?usp=email ) Change subject: HACK: Allow io_uring_submit batching just ahead of poll ...................................................................... HACK: Allow io_uring_submit batching just ahead of poll Let's add a mode (enabled via the LIBOSMO_IO_URING_BATCH environment variable), where we don't call io_uring_submit() after every operation we add to the submission queue. Rather, do that once before we go into poll. This should massively reduce the amount of io_uring_enter() syscalls we're seeing. Change-Id: Ia27ada909df246f21d110d8ae0b40229aacd579d --- M src/core/osmo_io_uring.c M src/core/select.c 2 files changed, 35 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/36364/1 diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index 569f150..6801eb4 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -60,6 +60,7 @@ }; static __thread struct osmo_io_uring g_ring; +static bool g_batch = false; static void iofd_uring_cqe(struct io_uring *ring); @@ -90,6 +91,9 @@ { int rc, evfd; + if (getenv("LIBOSMO_IO_URING_BATCH")) + g_batch = true; + rc = io_uring_queue_init(IOFD_URING_ENTRIES, &g_ring.ring, 0); if (rc < 0) osmo_panic("failure during io_uring_queue_init(): %s\n", strerror(-rc)); @@ -175,7 +179,8 @@ } io_uring_sqe_set_data(sqe, msghdr); - io_uring_submit(&g_ring.ring); + if (!g_batch) + io_uring_submit(&g_ring.ring); /* NOTE: This only works if we have one read per fd */ iofd->u.uring.read_msghdr = msghdr; } @@ -315,7 +320,8 @@ OSMO_ASSERT(0); } - io_uring_submit(&g_ring.ring); + if (!g_batch) + io_uring_submit(&g_ring.ring); iofd->u.uring.write_msghdr = msghdr; return 0; @@ -529,4 +535,10 @@ .notify_connected = iofd_uring_notify_connected, }; +void osmo_io_uring_submit(void) +{ + if (g_batch) + io_uring_submit(&g_ring.ring); +} + #endif /* defined(__linux__) */ diff --git a/src/core/select.c b/src/core/select.c index 70047f0..0a4302f 100644 --- a/src/core/select.c +++ b/src/core/select.c @@ -426,12 +426,16 @@ return work; } +void osmo_io_uring_submit(void); + static int _osmo_select_main(int polling) { unsigned int n_poll; int rc; int timeout = 0; + osmo_io_uring_submit(); + /* prepare read and write fdsets */ n_poll = poll_fill_fds(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36364?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia27ada909df246f21d110d8ae0b40229aacd579d Gerrit-Change-Number: 36364 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[L] Change in osmo-mgw[master]: Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36363?usp=email ) Change subject: Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io ...................................................................... Patch Set 1: (2 comments) File src/libosmo-mgcp/mgcp_network.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15252): https://gerrit.osmocom.org/c/osmo-mgw/+/36363/comment/1d6b142a_74778328 PS1, Line 1051: LOGP(DRTP, LOGL_DEBUG, "sending %i bytes length packet to %s ...\n", msgb_length(msg), Use %d instead of %i Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15252): https://gerrit.osmocom.org/c/osmo-mgw/+/36363/comment/9c7a5c75_fc5863d1 PS1, Line 1492: proto = (iofd == conn_src->end.rtp)? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; spaces required around that '?' (ctx:VxW) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36363?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8471960d5d8088a70cf105f2f40dfa5d5458169a Gerrit-Change-Number: 36363 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 19 Mar 2024 20:23:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Change msgb ownership in processing of received msgb

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-mgw/+/36361?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: Change msgb ownership in processing of received msgb ...................................................................... Change msgb ownership in processing of received msgb The old approach was: rtp_data_net() reads a msgb from the incomging socket, calls through whatever function chain and in the end free's it. So none of the intermediate functions was permitted to take msgb ownership. This was a good choice as all processing would happen synchronously, up to the point where that msgb was written on the output RTP socket. Let's change this from passing msgb ownership throug the whole call chain, through rx_rtp() to the various *_dispatch_rtp() functions. This is required for upcoming migration to osmo_io, as in that case the write (sendto) calls are asynchronous and hence msgb ownership needs to be transferred. Change-Id: I6a331f3c6b2eb51ea312ac6ef8c357185ddb79cf --- M TODO-RELEASE M src/libosmo-mgcp/mgcp_e1.c M src/libosmo-mgcp/mgcp_iuup.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c 5 files changed, 130 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/61/36361/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36361?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6a331f3c6b2eb51ea312ac6ef8c357185ddb79cf Gerrit-Change-Number: 36361 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[L] Change in osmo-mgw[master]: Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36363?usp=email ) Change subject: Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io ...................................................................... Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io Converting from osmo_fd to osmo_io allows us to switch to the new io_uring backend and benefit from related performance benefits. In a benchmark running 200 concurrent bi-directional voice calls with GSM-EFR codec, I am observing: * the code before this patch uses 40..42% of a single core on a Ryzen 5950X at 200 calls (=> 200 endpoints with each two connections) * no increase in CPU utilization before/after this patch, i.e. the osmo_io overhead for the osmo_fd backend is insignificant compared to the direct osmo_fd mode before * an almost exactly 50% reduction of CPU utilization when running the same osmo-mgw build with LIBOSMO_IO_BACKEND=IO_URING - top shows 19..21% for the same workload instead of 40..42% with the OSMO_FD default backend. * An increase of about 4 Megabytes in both RSS and VIRT size when enabling the OSMO_IO backend. This is likely the memory-mapped rings. No memory leakage is observed when using either of the backends. Change-Id: I8471960d5d8088a70cf105f2f40dfa5d5458169a --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_iuup.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c 6 files changed, 228 insertions(+), 165 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/63/36363/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index e61ba89..4dff4d0 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -24,6 +24,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/socket.h> +#include <osmocom/core/osmo_io.h> #include <osmocom/core/write_queue.h> #include <osmocom/core/timer.h> #include <osmocom/core/logging.h> @@ -205,4 +206,4 @@ int mgcp_create_bind(const char *source_addr, int port, uint8_t dscp, uint8_t prio); -int mgcp_udp_send(int fd, const struct osmo_sockaddr *addr, const char *buf, int len); +int mgcp_udp_send(struct osmo_io_fd *iofd, const struct osmo_sockaddr *addr, const char *buf, int len); diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index 1ec8979..8f6505c 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -4,6 +4,7 @@ #include <stdbool.h> #include <osmocom/core/socket.h> +#include <osmocom/core/osmo_io.h> #include <osmocom/mgcp/mgcp.h> @@ -120,8 +121,8 @@ bool rfc5993_hr_convert; /* Each end has a separate socket for RTP and RTCP */ - struct osmo_fd rtp; - struct osmo_fd rtcp; + struct osmo_io_fd *rtp; + struct osmo_io_fd *rtcp; /* local UDP port number of the RTP socket; RTCP is +1 */ int local_port; @@ -179,7 +180,7 @@ int id, int inc); void rtpconn_rate_ctr_inc(struct mgcp_conn_rtp *conn_rtp, struct mgcp_endpoint *endp, int id); -void forward_data_tap(int fd, struct mgcp_rtp_tap *tap, struct msgb *msg); +void forward_data_tap(struct osmo_io_fd *iofd, struct mgcp_rtp_tap *tap, struct msgb *msg); uint32_t mgcp_get_current_ts(unsigned codec_rate); int amr_oa_bwe_convert(struct mgcp_endpoint *endp, struct msgb *msg, bool target_is_oa); diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index d9bc573..5eb4897 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -106,8 +106,8 @@ /* backpointer to the generic part of the connection */ conn->u.rtp.conn = conn; - end->rtp.fd = -1; - end->rtcp.fd = -1; + end->rtp = NULL; + end->rtcp = NULL; memset(&end->addr, 0, sizeof(end->addr)); end->rtcp_port = 0; diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 3818d3e..7531e42 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -512,10 +512,9 @@ osmo_sockaddr_port(&rtp_end->addr.u.sa), ntohs(rtp_end->rtcp_port)); /* Forward a copy of the RTP data to a debug ip/port */ - forward_data_tap(rtp_end->rtp.fd, &conn_src->tap_out, - msg); + forward_data_tap(rtp_end->rtp, &conn_src->tap_out, msg); - len = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, (char *)hdr, buflen); + len = mgcp_udp_send(rtp_end->rtp, &rtp_end->addr, (char *)hdr, buflen); if (len <= 0) return len; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index d583229..b184c12 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -794,16 +794,18 @@ /* Forward data to a debug tap. This is debug function that is intended for * debugging the voice traffic with tools like gstreamer */ -void forward_data_tap(int fd, struct mgcp_rtp_tap *tap, struct msgb *msg) +void forward_data_tap(struct osmo_io_fd *iofd, struct mgcp_rtp_tap *tap, struct msgb *msg) { int rc; if (!tap->enabled) return; - rc = sendto(fd, msgb_data(msg), msgb_length(msg), 0, (struct sockaddr *)&tap->forward, - sizeof(tap->forward)); + struct msgb *msg2 = msgb_copy(msg, "RTP TAP Tx"); + if (!msg2) + return; + rc = osmo_iofd_sendto_msgb(iofd, msg2, 0, &tap->forward); if (rc < 0) LOGP(DRTP, LOGL_ERROR, "Forwarding tapped (debug) voice data failed.\n"); @@ -1039,29 +1041,34 @@ return -1; } -/*! send udp packet. - * \param[in] fd associated file descriptor. +/*! send message buffer via udp socket. + * \param[in] iofd associated file descriptor. + * \param[in] addr destination ip-address. + * \param[in] msg message buffer that holds the data to be send. + * \returns bytes sent, -1 on error. */ +static int mgcp_udp_send_msg(struct osmo_io_fd *iofd, const struct osmo_sockaddr *addr, struct msgb *msg) +{ + LOGP(DRTP, LOGL_DEBUG, "sending %i bytes length packet to %s ...\n", msgb_length(msg), + osmo_sockaddr_to_str(addr)); + + return osmo_iofd_sendto_msgb(iofd, msg, 0, addr); +} + +/*! send udp packet from raw buffer/length. + * \param[in] iofd associated file descriptor. * \param[in] addr destination ip-address. * \param[in] buf buffer that holds the data to be send. * \param[in] len length of the data to be sent. * \returns bytes sent, -1 on error. */ -int mgcp_udp_send(int fd, const struct osmo_sockaddr *addr, const char *buf, int len) +int mgcp_udp_send(struct osmo_io_fd *iofd, const struct osmo_sockaddr *addr, const char *buf, int len) { - char ipbuf[INET6_ADDRSTRLEN]; - size_t addr_len; + struct msgb *msg = msgb_alloc_c(iofd, len, "mgcp_udp_send"); + if (!msg) + return -ENOMEM; + memcpy(msg->tail, buf, len); + msgb_put(msg, len); - LOGP(DRTP, LOGL_DEBUG, - "sending %i bytes length packet to %s:%u ...\n", len, - osmo_sockaddr_ntop(&addr->u.sa, ipbuf), - osmo_sockaddr_port(&addr->u.sa)); - - if (addr->u.sa.sa_family == AF_INET6) { - addr_len = sizeof(addr->u.sin6); - } else { - addr_len = sizeof(addr->u.sin); - } - - return sendto(fd, buf, len, 0, &addr->u.sa, addr_len); + return mgcp_udp_send_msg(iofd, addr, msg); } /*! send RTP dummy packet (to keep NAT connection open). @@ -1089,8 +1096,7 @@ if (mgcp_conn_rtp_is_iuup(conn)) rc = mgcp_conn_iuup_send_dummy(conn); else - rc = mgcp_udp_send(conn->end.rtp.fd, &conn->end.addr, - rtp_dummy_payload, sizeof(rtp_dummy_payload)); + rc = mgcp_udp_send(conn->end.rtp, &conn->end.addr, rtp_dummy_payload, sizeof(rtp_dummy_payload)); if (rc == -1) goto failed; @@ -1101,7 +1107,7 @@ was_rtcp = 1; rtcp_addr = conn->end.addr; osmo_sockaddr_set_port(&rtcp_addr.u.sa, ntohs(conn->end.rtcp_port)); - rc = mgcp_udp_send(conn->end.rtcp.fd, &rtcp_addr, + rc = mgcp_udp_send(conn->end.rtcp, &rtcp_addr, rtp_dummy_payload, sizeof(rtp_dummy_payload)); if (rc >= 0) @@ -1188,6 +1194,7 @@ rc = endp->trunk->cfg->rtp_processing_cb(endp, rtp_end, msg); if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "Error %d during transcoding\n", rc); + msgb_free(msg); return rc; } @@ -1202,6 +1209,7 @@ LOGPENDP(endp, DRTP, LOGL_ERROR, "Error in AMR octet-aligned <-> bandwidth-efficient mode conversion (target=%s)\n", conn_dst->end.codec->param.amr_octet_aligned ? "octet-aligned" : "bandwidth-efficient"); + msgb_free(msg); return rc; } } else if (rtp_end->rfc5993_hr_convert && @@ -1209,6 +1217,7 @@ rc = rfc5993_hr_convert(endp, msg); if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "Error while converting to GSM-HR-08\n"); + msgb_free(msg); return rc; } } @@ -1222,22 +1231,21 @@ ); /* Forward a copy of the RTP data to a debug ip/port */ - forward_data_tap(rtp_end->rtp.fd, &conn_src->tap_out, - msg); + forward_data_tap(rtp_end->rtp, &conn_src->tap_out, msg); - len = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, - (char *)msgb_data(msg), msgb_length(msg)); - if (len <= 0) { + len = msgb_length(msg); + + rc = mgcp_udp_send_msg(rtp_end->rtp, &rtp_end->addr, msg); + if (rc < 0) { msgb_free(msg); - return len; + return rc; } rtpconn_rate_ctr_inc(conn_dst, endp, RTP_PACKETS_TX_CTR); rtpconn_rate_ctr_add(conn_dst, endp, RTP_OCTETS_TX_CTR, len); rtp_state->alt_rtp_tx_sequence++; - msgb_free(msg); - return len; + return 0; } else if (!trunk->omit_rtcp) { struct osmo_sockaddr rtcp_addr = rtp_end->addr; osmo_sockaddr_set_port(&rtcp_addr.u.sa, rtp_end->rtcp_port); @@ -1248,15 +1256,19 @@ osmo_sockaddr_port(&rtcp_addr.u.sa) ); - len = mgcp_udp_send(rtp_end->rtcp.fd, &rtcp_addr, - (char *)msgb_data(msg), msgb_length(msg)); + len = msgb_length(msg); + + rc = mgcp_udp_send_msg(rtp_end->rtcp, &rtcp_addr, msg); + if (rc < 0) { + msgb_free(msg); + return rc; + } rtpconn_rate_ctr_inc(conn_dst, endp, RTP_PACKETS_TX_CTR); rtpconn_rate_ctr_add(conn_dst, endp, RTP_OCTETS_TX_CTR, len); rtp_state->alt_rtp_tx_sequence++; - msgb_free(msg); - return len; + return 0; } msgb_free(msg); @@ -1458,7 +1470,7 @@ } /* Handle incoming RTP data from NET */ -static int rtp_data_net(struct osmo_fd *fd, unsigned int what) +static void rtp_recvfrom_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg, const struct osmo_sockaddr *saddr) { /* NOTE: This is a generic implementation. RTP data is received. In * case of loopback the data is just sent back to its origin. All @@ -1469,49 +1481,34 @@ struct mgcp_conn_rtp *conn_src; struct mgcp_endpoint *endp; - struct osmo_sockaddr addr; - socklen_t slen = sizeof(addr); - char ipbuf[INET6_ADDRSTRLEN]; - int ret; enum rtp_proto proto; struct osmo_rtp_msg_ctx *mc; - struct msgb *msg; - int rc; - conn_src = (struct mgcp_conn_rtp *)fd->data; + conn_src = (struct mgcp_conn_rtp *) osmo_iofd_get_data(iofd); OSMO_ASSERT(conn_src); endp = conn_src->conn->endp; OSMO_ASSERT(endp); - msg = msgb_alloc_c(endp->trunk, RTP_BUF_SIZE, "RTP-rx"); - proto = (fd == &conn_src->end.rtp)? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; + proto = (iofd == conn_src->end.rtp)? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; - ret = recvfrom(fd->fd, msgb_data(msg), msg->data_len, 0, (struct sockaddr *)&addr.u.sa, &slen); - - if (ret <= 0) { - LOG_CONN_RTP(conn_src, LOGL_ERROR, "recvfrom error: %s\n", strerror(errno)); - rc = -1; - goto out; + if (res <= 0) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "recvfrom error: %s\n", strerror(-res)); + goto out_free; } - msgb_put(msg, ret); - - LOG_CONN_RTP(conn_src, LOGL_DEBUG, "%s: rx %u bytes from %s:%u\n", + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "%s: rx %u bytes from %s\n", proto == MGCP_PROTO_RTP ? "RTP" : "RTCP", - msgb_length(msg), osmo_sockaddr_ntop(&addr.u.sa, ipbuf), - osmo_sockaddr_port(&addr.u.sa)); + msgb_length(msg), osmo_sockaddr_to_str(saddr)); if ((proto == MGCP_PROTO_RTP && check_rtp(conn_src, msg)) || (proto == MGCP_PROTO_RTCP && check_rtcp(conn_src, msg))) { /* Logging happened in the two check_ functions */ - rc = -1; - goto out; + goto out_free; } if (mgcp_is_rtp_dummy_payload(msg)) { LOG_CONN_RTP(conn_src, LOGL_DEBUG, "rx dummy packet (dropped)\n"); - rc = 0; - goto out; + goto out_free; } /* Since the msgb remains owned and freed by this function, the msg ctx data struct can just be on the stack and @@ -1520,7 +1517,7 @@ *mc = (struct osmo_rtp_msg_ctx){ .proto = proto, .conn_src = conn_src, - .from_addr = &addr, + .from_addr = (struct osmo_sockaddr *) saddr, }; LOG_CONN_RTP(conn_src, LOGL_DEBUG, "msg ctx: %d %p %s\n", mc->proto, mc->conn_src, @@ -1535,12 +1532,13 @@ /* FIXME: count RTP and RTCP separately, also count IuUP payload-less separately */ /* Forward a copy of the RTP data to a debug ip/port */ - forward_data_tap(fd->fd, &conn_src->tap_in, msg); + forward_data_tap(iofd, &conn_src->tap_in, msg); - rc = rx_rtp(msg); + rx_rtp(msg); + return; -out: - return rc; +out_free: + msgb_free(msg); } /* Note: This function is able to handle RTP and RTCP. msgb ownership is transferred, so this function or its @@ -1587,6 +1585,24 @@ return -1; } +static void rtp_sendto_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg, const struct osmo_sockaddr *daddr) +{ + /* nothing; osmo_io takes care of msgb_free */ + if (res < 0) { + struct mgcp_conn_rtp *conn_rtp = (struct mgcp_conn_rtp *) osmo_iofd_get_data(iofd); + int priv_nr = osmo_iofd_get_priv_nr(iofd); + char errbuf[129]; + strerror_r(-res, errbuf, sizeof(errbuf)); + LOG_CONN_RTP(conn_rtp, LOGL_NOTICE, "%s sendto(%s) failed: %s\n", priv_nr ? "RTCP" : "RTP", + osmo_sockaddr_to_str(daddr), errbuf); + } +} + +static const struct osmo_io_ops rtp_ioops = { + .recvfrom_cb = rtp_recvfrom_cb, + .sendto_cb = rtp_sendto_cb, +}; + /*! bind RTP port to osmo_fd. * \param[in] source_addr source (local) address to bind on. * \param[in] port to bind on. @@ -1614,7 +1630,7 @@ static int bind_rtp(struct mgcp_config *cfg, const char *source_addr, struct mgcp_rtp_end *rtp_end, struct mgcp_endpoint *endp) { - int rc; + int rc, rtp_fd, rtcp_fd; /* NOTE: The port that is used for RTCP is the RTP port incremented by one * (e.g. RTP-Port = 16000 ==> RTCP-Port = 16001) */ @@ -1626,7 +1642,7 @@ source_addr, rtp_end->local_port); goto cleanup0; } - rtp_end->rtp.fd = rc; + rtp_fd = rc; rc = mgcp_create_bind(source_addr, rtp_end->local_port + 1, cfg->endp_dscp, cfg->endp_priority); if (rc < 0) { @@ -1635,16 +1651,16 @@ source_addr, rtp_end->local_port + 1); goto cleanup1; } - rtp_end->rtcp.fd = rc; + rtcp_fd = rc; - if (osmo_fd_register(&rtp_end->rtp) != 0) { + if (osmo_iofd_register(rtp_end->rtp, rtp_fd) < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "failed to register RTP port %d\n", rtp_end->local_port); goto cleanup2; } - if (osmo_fd_register(&rtp_end->rtcp) != 0) { + if (osmo_iofd_register(rtp_end->rtcp, rtcp_fd) != 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "failed to register RTCP port %d\n", rtp_end->local_port + 1); @@ -1654,13 +1670,11 @@ return 0; cleanup3: - osmo_fd_unregister(&rtp_end->rtp); + osmo_iofd_unregister(rtp_end->rtp); cleanup2: - close(rtp_end->rtcp.fd); - rtp_end->rtcp.fd = -1; + close(rtcp_fd); cleanup1: - close(rtp_end->rtp.fd); - rtp_end->rtp.fd = -1; + close(rtp_fd); cleanup0: return -1; } @@ -1679,7 +1693,8 @@ snprintf(name, sizeof(name), "%s-%s", conn->conn->name, conn->conn->id); end = &conn->end; - if (end->rtp.fd != -1 || end->rtcp.fd != -1) { + if ((end->rtp && osmo_iofd_get_fd(end->rtp) != -1) || + (end->rtcp && osmo_iofd_get_fd(end->rtcp) != -1)) { LOGPENDP(endp, DRTP, LOGL_ERROR, "%u was already bound on conn:%s\n", rtp_port, mgcp_conn_dump(conn->conn)); @@ -1692,8 +1707,18 @@ } end->local_port = rtp_port; - osmo_fd_setup(&end->rtp, -1, OSMO_FD_READ, rtp_data_net, conn, 0); - osmo_fd_setup(&end->rtcp, -1, OSMO_FD_READ, rtp_data_net, conn, 0); + end->rtp = osmo_iofd_setup(conn->conn, -1, name, OSMO_IO_FD_MODE_RECVFROM_SENDTO, &rtp_ioops, conn); + if (!end->rtp) + return -EIO; + osmo_iofd_set_alloc_info(end->rtp, RTP_BUF_SIZE, 0); + end->rtcp = osmo_iofd_setup(conn->conn, -1, name, OSMO_IO_FD_MODE_RECVFROM_SENDTO, &rtp_ioops, conn); + if (!end->rtcp) { + osmo_iofd_free(end->rtp); + end->rtp = NULL; + return -EIO; + } + osmo_iofd_set_alloc_info(end->rtcp, RTP_BUF_SIZE, 0); + osmo_iofd_set_priv_nr(end->rtcp, 1); /* we use priv_nr as identifier for RTCP */ return bind_rtp(endp->trunk->cfg, conn->end.local_addr, end, endp); } @@ -1702,15 +1727,13 @@ * \param[in] end RTP end */ void mgcp_free_rtp_port(struct mgcp_rtp_end *end) { - if (end->rtp.fd != -1) { - osmo_fd_unregister(&end->rtp); - close(end->rtp.fd); - end->rtp.fd = -1; + if (end->rtp) { + osmo_iofd_free(end->rtp); + end->rtp = NULL; } - if (end->rtcp.fd != -1) { - osmo_fd_unregister(&end->rtcp); - close(end->rtcp.fd); - end->rtcp.fd = -1; + if (end->rtcp) { + osmo_iofd_free(end->rtcp); + end->rtcp = NULL; } } diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 70798eb..d3acb64 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -13,9 +13,11 @@ #include <string.h> /* for memcpy */ #include <stdlib.h> /* for abs */ #include <inttypes.h> /* for PRIu64 */ +#include <unistd.h> /* for PRIu64 */ #include <netinet/in.h> #include <osmocom/core/msgb.h> #include <osmocom/core/socket.h> +#include <osmocom/core/osmo_io.h> #include <osmocom/core/talloc.h> #include <osmocom/netif/osmux.h> @@ -30,8 +32,8 @@ #include <osmocom/mgcp/mgcp_endp.h> #include <osmocom/mgcp/mgcp_trunk.h> -static struct osmo_fd osmux_fd_v4; -static struct osmo_fd osmux_fd_v6; +static struct osmo_io_fd *osmux_fd_v4; +static struct osmo_io_fd *osmux_fd_v6; static LLIST_HEAD(osmux_handle_list); @@ -76,34 +78,31 @@ static void osmux_deliver_cb(struct msgb *batch_msg, void *data) { struct osmux_handle *handle = data; - socklen_t dest_len; - int rc, fd; - struct mgcp_trunk *trunk = (struct mgcp_trunk *)osmux_fd_v4.data; + int rc; + struct osmo_io_fd *iofd; + struct mgcp_trunk *trunk = (struct mgcp_trunk *) osmo_iofd_get_data(osmux_fd_v4); struct rate_ctr_group *all_osmux_stats = trunk->ratectr.all_osmux_conn_stats; switch (handle->rem_addr.u.sa.sa_family) { case AF_INET6: - dest_len = sizeof(handle->rem_addr.u.sin6); - fd = osmux_fd_v6.fd; + iofd = osmux_fd_v6; break; case AF_INET: default: - dest_len = sizeof(handle->rem_addr.u.sin); - fd = osmux_fd_v4.fd; + iofd = osmux_fd_v4; break; } - rc = sendto(fd, batch_msg->data, batch_msg->len, 0, - (struct sockaddr *)&handle->rem_addr.u.sa, dest_len); + rc = osmo_iofd_sendto_msgb(iofd, batch_msg, 0, &handle->rem_addr); if (rc < 0) { char errbuf[129]; - strerror_r(errno, errbuf, sizeof(errbuf)); + strerror_r(-rc, errbuf, sizeof(errbuf)); LOGP(DOSMUX, LOGL_NOTICE, "osmux sendto(%s) failed: %s\n", osmo_sockaddr_to_str(&handle->rem_addr), errbuf); rate_ctr_inc(rate_ctr_group_get_ctr(all_osmux_stats, OSMUX_DROPPED_PACKETS_CTR)); + msgb_free(batch_msg); } else { rate_ctr_inc(rate_ctr_group_get_ctr(all_osmux_stats, OSMUX_PACKETS_TX_CTR)); } - msgb_free(batch_msg); } /* Lookup existing OSMUX handle for specified destination address. */ @@ -322,28 +321,6 @@ /* dispatch_rtp_cb() has taken ownership of the msgb */ } -static struct msgb *osmux_recv(struct osmo_fd *ofd, struct osmo_sockaddr *addr) -{ - struct msgb *msg; - socklen_t slen = sizeof(addr->u.sas); - int ret; - - msg = msgb_alloc(4096, "OSMUX"); - if (!msg) { - LOGP(DOSMUX, LOGL_ERROR, "cannot allocate message\n"); - return NULL; - } - ret = recvfrom(ofd->fd, msg->data, msg->data_len, 0, &addr->u.sa, &slen); - if (ret <= 0) { - msgb_free(msg); - LOGP(DOSMUX, LOGL_ERROR, "cannot receive message\n"); - return NULL; - } - msgb_put(msg, ret); - - return msg; -} - /* To be called every time some AMR data is received on a connection * returns: 0 if conn can process data, negative if an error ocurred and data should not be further processed */ static int conn_osmux_event_data_received(struct mgcp_conn_rtp *conn, const struct osmo_sockaddr *rem_addr) @@ -439,22 +416,16 @@ } #define osmux_chunk_length(msg, rem) ((rem) - (msg)->len) -static int osmux_read_fd_cb(struct osmo_fd *ofd, unsigned int what) +static void osmux_recvfrom_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg, const struct osmo_sockaddr *rem_addr) { - struct msgb *msg; struct osmux_hdr *osmuxh; - struct osmo_sockaddr rem_addr; - uint32_t rem; - struct mgcp_trunk *trunk = ofd->data; + struct mgcp_trunk *trunk = osmo_iofd_get_data(iofd); struct rate_ctr_group *all_rtp_stats = trunk->ratectr.all_osmux_conn_stats; + uint32_t rem; char addr_str[64]; - msg = osmux_recv(ofd, &rem_addr); - if (!msg) - return -1; - rate_ctr_inc(rate_ctr_group_get_ctr(all_rtp_stats, OSMUX_PACKETS_RX_CTR)); - osmo_sockaddr_to_str_buf(addr_str, sizeof(addr_str), &rem_addr); + osmo_sockaddr_to_str_buf(addr_str, sizeof(addr_str), rem_addr); if (trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) { LOGP(DOSMUX, LOGL_ERROR, @@ -464,14 +435,16 @@ } /* Catch legacy dummy message and process them separately: */ - if (msg->len == 2 && msg->data[0] == MGCP_DUMMY_LOAD) - return osmux_handle_legacy_dummy(trunk, &rem_addr, msg); + if (msg->len == 2 && msg->data[0] == MGCP_DUMMY_LOAD) { + osmux_handle_legacy_dummy(trunk, rem_addr, msg); + return; + } rem = msg->len; while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) { struct mgcp_conn_rtp *conn_src; conn_src = osmux_conn_lookup(trunk, osmuxh->circuit_id, - &rem_addr); + rem_addr); if (!conn_src) { LOGP(DOSMUX, LOGL_DEBUG, "Cannot find a src conn for %s CID=%d\n", @@ -479,7 +452,7 @@ goto next; } - if (conn_osmux_event_data_received(conn_src, &rem_addr) < 0) + if (conn_osmux_event_data_received(conn_src, rem_addr) < 0) goto next; mgcp_conn_watchdog_kick(conn_src->conn); @@ -493,19 +466,38 @@ } out: msgb_free(msg); - return 0; } +static void osmux_sendto_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg, const struct osmo_sockaddr *rem_addr) +{ + /* nothing; osmo_io takes care of msgb_free */ + if (res < 0) { + struct mgcp_trunk *trunk = (struct mgcp_trunk *) osmo_iofd_get_data(iofd); + struct rate_ctr_group *all_osmux_stats = trunk->ratectr.all_osmux_conn_stats; + char errbuf[129]; + strerror_r(-res, errbuf, sizeof(errbuf)); + LOGP(DOSMUX, LOGL_NOTICE, "osmux sendto(%s) failed: %s\n", osmo_sockaddr_to_str(rem_addr), errbuf); + rate_ctr_inc(rate_ctr_group_get_ctr(all_osmux_stats, OSMUX_DROPPED_PACKETS_CTR)); + } +} + +static const struct osmo_io_ops osmux_ioops = { + .recvfrom_cb = osmux_recvfrom_cb, + .sendto_cb = osmux_sendto_cb, +}; + int osmux_init(struct mgcp_trunk *trunk) { - int ret; + int ret, fd; struct mgcp_config *cfg = trunk->cfg; /* So far we only support running on one trunk: */ OSMO_ASSERT(trunk == mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID)); - osmo_fd_setup(&osmux_fd_v4, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); - osmo_fd_setup(&osmux_fd_v6, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); + osmux_fd_v4 = osmo_iofd_setup(trunk, -1, "osmux_fd_v4", OSMO_IO_FD_MODE_RECVFROM_SENDTO, &osmux_ioops, trunk); + if (!osmux_fd_v4) + goto out; + osmo_iofd_set_alloc_info(osmux_fd_v4, 4096, 0); if (cfg->osmux.local_addr_v4) { ret = mgcp_create_bind(cfg->osmux.local_addr_v4, cfg->osmux.local_port, @@ -513,40 +505,55 @@ if (ret < 0) { LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv4 socket to %s:%u\n", cfg->osmux.local_addr_v4, cfg->osmux.local_port); - return ret; + goto out_free_v4; } - osmux_fd_v4.fd = ret; + fd = ret; - ret = osmo_fd_register(&osmux_fd_v4); + ret = osmo_iofd_register(osmux_fd_v4, fd); if (ret < 0) { - LOGP(DOSMUX, LOGL_ERROR, "Cannot register OSMUX IPv4 socket %s\n", - osmo_sock_get_name2(osmux_fd_v4.fd)); - return ret; + LOGP(DOSMUX, LOGL_ERROR, "Cannot register OSMUX IPv4 socket %s\n", osmo_sock_get_name2(fd)); + close(fd); + goto out_free_v4; } - LOGP(DOSMUX, LOGL_INFO, "OSMUX IPv4 socket listening on %s\n", - osmo_sock_get_name2(osmux_fd_v4.fd)); + LOGP(DOSMUX, LOGL_INFO, "OSMUX IPv4 socket listening on %s\n", osmo_sock_get_name2(fd)); } + + osmux_fd_v6 = osmo_iofd_setup(trunk, -1, "osmux_fd_v6", OSMO_IO_FD_MODE_RECVFROM_SENDTO, &osmux_ioops, trunk); + if (!osmux_fd_v6) + goto out_free_v4; + osmo_iofd_set_alloc_info(osmux_fd_v6, 4096, 0); + if (cfg->osmux.local_addr_v6) { ret = mgcp_create_bind(cfg->osmux.local_addr_v6, cfg->osmux.local_port, cfg->endp_dscp, cfg->endp_priority); if (ret < 0) { LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv6 socket to [%s]:%u\n", cfg->osmux.local_addr_v6, cfg->osmux.local_port); - return ret; + goto out_free_v6; } - osmux_fd_v6.fd = ret; + fd = ret; - ret = osmo_fd_register(&osmux_fd_v6); + ret = osmo_iofd_register(osmux_fd_v6, fd); if (ret < 0) { - LOGP(DOSMUX, LOGL_ERROR, "Cannot register OSMUX IPv6 socket %s\n", - osmo_sock_get_name2(osmux_fd_v6.fd)); - return ret; + LOGP(DOSMUX, LOGL_ERROR, "Cannot register OSMUX IPv6 socket %s\n", osmo_sock_get_name2(fd)); + close(fd); + goto out_free_v6; } - LOGP(DOSMUX, LOGL_INFO, "OSMUX IPv6 socket listening on %s\n", - osmo_sock_get_name2(osmux_fd_v6.fd)); + LOGP(DOSMUX, LOGL_INFO, "OSMUX IPv6 socket listening on %s\n", osmo_sock_get_name2(fd)); } cfg->osmux.initialized = true; return 0; + +out_free_v6: + /* osmo_iofd_free performs unregister + close */ + osmo_iofd_free(osmux_fd_v6); + osmux_fd_v6 = NULL; +out_free_v4: + /* osmo_iofd_free performs unregister + close */ + osmo_iofd_free(osmux_fd_v4); + osmux_fd_v4 = NULL; +out: + return -1; } /*! relase OSXMUX cid, that had been allocated to this connection. @@ -712,7 +719,7 @@ osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), osmo_sockaddr_port(&conn->end.addr.u.sa), conn->osmux.remote_cid); - return mgcp_udp_send(osmux_fd_v4.fd, &conn->end.addr, (char *)osmuxh, buf_len); + return mgcp_udp_send(osmux_fd_v4, &conn->end.addr, (char *)osmuxh, buf_len); } /* Keeps track of locally allocated Osmux circuit ID. +7 to round up to 8 bit boundary. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36363?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8471960d5d8088a70cf105f2f40dfa5d5458169a Gerrit-Change-Number: 36363 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: msgb: Also copy msgb {dst, lchan, cb} during msgb_copy_*

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36324?usp=email ) Change subject: msgb: Also copy msgb {dst, lchan, cb} during msgb_copy_* ...................................................................... Patch Set 2: (1 comment) File src/core/msgb.c: https://gerrit.osmocom.org/c/libosmocore/+/36324/comment/8d80ac34_4e0e9f4a PS1, Line 320: * and adjusts the pointers (incl l1h-l4h) accordingly. The cb part is not copied. > mh, ok. so the old function was *specified* not to copy the cb. That's weird. […] I did a rather exhaustive study and could not find any osmocoom code that would rely on the existing behaviour of not copying the cb. It should therefore be safe to merge this patch, but of course the comment should be updated to reflect reality. I still don't feel 100% allright with changing the semantics. Even if I believe the cb should always have been copied, we had different behaviour since the function was introduced in 2015... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36324?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I68328adb952ca8833ba047cb3b49ccc6f8a1f1b5 Gerrit-Change-Number: 36324 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Mar 2024 19:46:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: WIP: migrate gsmtap logging over to osmo_io

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36362?usp=email ) Change subject: WIP: migrate gsmtap logging over to osmo_io ...................................................................... WIP: migrate gsmtap logging over to osmo_io This is working in principle; The problem is just that osmo_io itself contains LOGP calls from within osmo_iofd_write_msgb() and downstream code, so we might easily get up in an infinite recursion bug. This needs further study; possibly we need a "safe" logging function which will never use osmo_io. Or something like a per-thread global boolean variable which the code can check to know if it's re-entering? Change-Id: I69d7eca7d50666b4fcfe73a1dc03f8e8491b32fc --- M include/osmocom/core/gsmtap_util.h M src/core/gsmtap_util.c M src/core/libosmocore.map M src/vty/logging_vty.c 4 files changed, 41 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/36362/1 diff --git a/include/osmocom/core/gsmtap_util.h b/include/osmocom/core/gsmtap_util.h index d24ee95..e755931 100644 --- a/include/osmocom/core/gsmtap_util.h +++ b/include/osmocom/core/gsmtap_util.h @@ -1,5 +1,6 @@ #pragma once +#include <stdbool.h> #include <stdint.h> #include <osmocom/core/write_queue.h> #include <osmocom/core/select.h> @@ -31,6 +32,8 @@ int gsmtap_inst_fd2(const struct gsmtap_inst *gti); +bool gsmtap_inst_get_osmo_io_mode(const struct gsmtap_inst *gti); + int gsmtap_source_init_fd(const char *host, uint16_t port); int gsmtap_source_init_fd2(const char *local_host, uint16_t local_port, const char *rem_host, uint16_t rem_port); diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index b64c7b0..6c36b28 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -38,6 +38,7 @@ #include <stdio.h> #include <unistd.h> #include <stdint.h> +#include <stdbool.h> #include <string.h> #include <errno.h> @@ -85,6 +86,12 @@ return gti->wq.bfd.fd; } +/*! determine whether the gsmtap_inst is in osmo_io mode or not. */ +bool gsmtap_inst_get_osmo_io_mode(const struct gsmtap_inst *gti) +{ + return gti->osmo_io_mode; +} + /*! convert RSL channel number to GSMTAP channel type * \param[in] rsl_chantype RSL channel type * \param[in] link_id RSL link identifier diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 072efee..bdbfe07 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -41,6 +41,7 @@ gsmtap_gsm_channel_names; gsmtap_inst_fd; gsmtap_inst_fd2; +gsmtap_inst_get_osmo_io_mode; gsmtap_makemsg; gsmtap_makemsg_ex; gsmtap_send; diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 2a07422..bfe73bb 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -29,6 +29,7 @@ #include <osmocom/core/strrb.h> #include <osmocom/core/loggingrb.h> #include <osmocom/core/gsmtap.h> +#include <osmocom/core/gsmtap_util.h> #include <osmocom/core/application.h> #include <osmocom/vty/command.h> @@ -803,18 +804,24 @@ } DEFUN(cfg_log_gsmtap, cfg_log_gsmtap_cmd, - "log gsmtap [HOSTNAME]", + "log gsmtap [HOSTNAME] [sync-io]", LOG_STR "Logging via GSMTAP\n" "Host name to send the GSMTAP logging to (UDP port 4729)\n") { - const char *hostname = argc ? argv[0] : "127.0.0.1"; + const char *hostname = "127.0.0.1"; + bool async_io = true; struct log_target *tgt; + if (argc >= 1) + hostname = argv[0]; + if (argc >= 2 && !strcmp(argv[1], "sync-io")) + async_io = false; + log_tgt_mutex_lock(); tgt = log_target_find(LOG_TGT_TYPE_GSMTAP, hostname); if (!tgt) { tgt = log_target_create_gsmtap(hostname, GSMTAP_UDP_PORT, - host.app_info->name, false, + host.app_info->name, async_io, true); if (!tgt) { vty_out(vty, "%% Unable to create GSMTAP log for %s%s", @@ -1032,8 +1039,9 @@ log_target_rb_avail_size(tgt), VTY_NEWLINE); break; case LOG_TGT_TYPE_GSMTAP: - vty_out(vty, "log gsmtap %s%s", - tgt->tgt_gsmtap.hostname, VTY_NEWLINE); + vty_out(vty, "log gsmtap %s%s%s", tgt->tgt_gsmtap.hostname, + gsmtap_inst_get_osmo_io_mode(tgt->tgt_gsmtap.gsmtap_inst) ? "" : " sync-io", + VTY_NEWLINE); break; case LOG_TGT_TYPE_SYSTEMD: vty_out(vty, "log systemd-journal%s%s", -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36362?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I69d7eca7d50666b4fcfe73a1dc03f8e8491b32fc Gerrit-Change-Number: 36362 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Change msgb ownership in processing of received msgb

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36361?usp=email ) Change subject: Change msgb ownership in processing of received msgb ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp/mgcp_network.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15248): https://gerrit.osmocom.org/c/osmo-mgw/+/36361/comment/892eaba7_ce3f0f8c PS1, Line 1285: else else is not generally useful after a break or return -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36361?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6a331f3c6b2eb51ea312ac6ef8c357185ddb79cf Gerrit-Change-Number: 36361 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 19 Mar 2024 18:03:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: remove osmo_fd from mgcp_create_bind()

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36360?usp=email ) Change subject: remove osmo_fd from mgcp_create_bind() ...................................................................... remove osmo_fd from mgcp_create_bind() preparation for osmo_io Change-Id: I4a3b66a14fdfbc867daca0f0a05f694d5e0d7b66 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c 3 files changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/60/36360/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index bfb412b..e61ba89 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -204,6 +204,5 @@ int mgcp_send_reset_all(struct mgcp_config *cfg); -int mgcp_create_bind(const char *source_addr, struct osmo_fd *fd, int port, uint8_t dscp, - uint8_t prio); +int mgcp_create_bind(const char *source_addr, int port, uint8_t dscp, uint8_t prio); int mgcp_udp_send(int fd, const struct osmo_sockaddr *addr, const char *buf, int len); diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index ee25f74..0a1bc11 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1517,13 +1517,11 @@ /*! bind RTP port to osmo_fd. * \param[in] source_addr source (local) address to bind on. - * \param[in] fd associated file descriptor. * \param[in] port to bind on. * \param[in] dscp IP DSCP value to use. * \param[in] prio socket priority to use. * \returns 0 on success, -1 on ERROR. */ -int mgcp_create_bind(const char *source_addr, struct osmo_fd *fd, int port, uint8_t dscp, - uint8_t prio) +int mgcp_create_bind(const char *source_addr, int port, uint8_t dscp, uint8_t prio) { int rc; @@ -1535,34 +1533,37 @@ source_addr, port); return -1; } - fd->fd = rc; LOGP(DRTP, LOGL_DEBUG, "created socket + bound UDP port (%s:%i).\n", source_addr, port); - return 0; + return rc; } /* Bind RTP and RTCP port (helper function for mgcp_bind_net_rtp_port()) */ static int bind_rtp(struct mgcp_config *cfg, const char *source_addr, struct mgcp_rtp_end *rtp_end, struct mgcp_endpoint *endp) { + int rc; + /* NOTE: The port that is used for RTCP is the RTP port incremented by one * (e.g. RTP-Port = 16000 ==> RTCP-Port = 16001) */ - if (mgcp_create_bind(source_addr, &rtp_end->rtp, rtp_end->local_port, - cfg->endp_dscp, cfg->endp_priority) != 0) { + rc = mgcp_create_bind(source_addr, rtp_end->local_port, cfg->endp_dscp, cfg->endp_priority); + if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "failed to create RTP port: %s:%d\n", source_addr, rtp_end->local_port); goto cleanup0; } + rtp_end->rtp.fd = rc; - if (mgcp_create_bind(source_addr, &rtp_end->rtcp, rtp_end->local_port + 1, - cfg->endp_dscp, cfg->endp_priority) != 0) { + rc = mgcp_create_bind(source_addr, rtp_end->local_port + 1, cfg->endp_dscp, cfg->endp_priority); + if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "failed to create RTCP port: %s:%d\n", source_addr, rtp_end->local_port + 1); goto cleanup1; } + rtp_end->rtcp.fd = rc; if (osmo_fd_register(&rtp_end->rtp) != 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 185aecd..997b07b 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -514,13 +514,14 @@ osmo_fd_setup(&osmux_fd_v6, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); if (cfg->osmux.local_addr_v4) { - ret = mgcp_create_bind(cfg->osmux.local_addr_v4, &osmux_fd_v4, cfg->osmux.local_port, + ret = mgcp_create_bind(cfg->osmux.local_addr_v4, cfg->osmux.local_port, cfg->endp_dscp, cfg->endp_priority); if (ret < 0) { LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv4 socket to %s:%u\n", cfg->osmux.local_addr_v4, cfg->osmux.local_port); return ret; } + osmux_fd_v4.fd = ret; ret = osmo_fd_register(&osmux_fd_v4); if (ret < 0) { @@ -532,13 +533,14 @@ osmo_sock_get_name2(osmux_fd_v4.fd)); } if (cfg->osmux.local_addr_v6) { - ret = mgcp_create_bind(cfg->osmux.local_addr_v6, &osmux_fd_v6, cfg->osmux.local_port, + ret = mgcp_create_bind(cfg->osmux.local_addr_v6, cfg->osmux.local_port, cfg->endp_dscp, cfg->endp_priority); if (ret < 0) { LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv6 socket to [%s]:%u\n", cfg->osmux.local_addr_v6, cfg->osmux.local_port); return ret; } + osmux_fd_v6.fd = ret; ret = osmo_fd_register(&osmux_fd_v6); if (ret < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36360?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4a3b66a14fdfbc867daca0f0a05f694d5e0d7b66 Gerrit-Change-Number: 36360 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Change msgb ownership in processing of received msgb

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36361?usp=email ) Change subject: Change msgb ownership in processing of received msgb ...................................................................... Change msgb ownership in processing of received msgb The old approach was: rtp_data_net() reads a msgb from the incomging socket, calls through whatever function chain and in the end free's it. So none of the intermediate functions was permitted to take msgb ownership. This was a good choice as all processing would happen synchronously, up to the point where that msgb was written on the output RTP socket. Let's change this from passing msgb ownership throug the whole call chain, through rx_rtp() to the various *_dispatch_rtp() functions. This is required for upcoming migration to osmo_io, as in that case the write (sendto) calls are asynchronous and hence msgb ownership needs to be transferred. Change-Id: I6a331f3c6b2eb51ea312ac6ef8c357185ddb79cf --- M TODO-RELEASE M src/libosmo-mgcp/mgcp_e1.c M src/libosmo-mgcp/mgcp_iuup.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c 5 files changed, 131 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/61/36361/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index ea29b6a..59da45b 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -39,3 +39,5 @@ is backwards compat code that moves codecs[] entries, if any, over to ptmap[], so callers may migrate at own leisure. osmo-mgw remove cfg Remove VTY config item 'sdp audio fmtp-extra' (see OS#6313) +libosmocore bump_dep; workaround Bump libosmocore version dependency after I68328adb952ca8833ba047cb3b49ccc6f8a1f1b5 + has been merged to libosmocore.git; then remove my_msgb_copy_c wrapper function. diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c index 40f976b..20aff95 100644 --- a/src/libosmo-mgcp/mgcp_e1.c +++ b/src/libosmo-mgcp/mgcp_e1.c @@ -301,7 +301,6 @@ mgcp_send(endp, 1, NULL, msg, &conn_dst->u.rtp, &conn_dst->u.rtp); - msgb_free(msg); return; skip: rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, E1_I460_TRAU_RX_FAIL_CTR)); diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 6ad62c8..3818d3e 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -311,7 +311,6 @@ }; rc = mgcp_send(conn_rtp_dst->conn->endp, true, NULL, msg, conn_rtp_src, conn_rtp_dst); - msgb_free(msg); return rc; } @@ -640,7 +639,7 @@ } /* Build IuUP RNL Data primitive from msg containing an incoming RTP pkt from - * peer and send it down the IuUP layer towards the destination as IuUP/RTP: */ + * peer and send it down the IuUP layer towards the destination as IuUP/RTP. Takes ownership of msg. */ int mgcp_conn_iuup_send_rtp(struct mgcp_conn_rtp *conn_src_rtp, struct mgcp_conn_rtp *conn_dest_rtp, struct msgb *msg) { struct osmo_iuup_rnl_prim *irp; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 0a1bc11..3ed4814 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -70,6 +70,18 @@ rtpconn_rate_ctr_add(conn_rtp, endp, id, 1); } +/* wrapper around libosmocore msgb_copy_c, which [at least before libosmocore.git Change-Id + * I68328adb952ca8833ba047cb3b49ccc6f8a1f1b5] doesn't copy the cb */ +static inline struct msgb *mgw_msgb_copy_c(void *ctx, struct msgb *msg, const char *name) +{ + struct msgb *msg2 = msgb_copy_c(ctx, msg, name); + if (OSMO_UNLIKELY(!msg2)) + return NULL; + + memcpy(msg2->cb, msg->cb, sizeof(msg2->cb)); + return msg2; +} + static int rx_rtp(struct msgb *msg); bool mgcp_rtp_end_remote_addr_available(const struct mgcp_rtp_end *rtp_end) @@ -963,7 +975,7 @@ return 0; } -/*! Dispatch msg bridged from the sister conn in the endpoint. +/*! Dispatch msg bridged from the sister conn in the endpoint. Takes ownership of msgb. * \param[in] conn_dst The destination conn that should handle and transmit the content to * its peer outside MGW. * \param[in] msg msgb containing an RTP pkt received by the sister conn in the endpoint, @@ -985,8 +997,10 @@ /* Before we try to deliver the packet, we check if the destination * port and IP-Address make sense at all. If not, we will be unable * to deliver the packet. */ - if (check_rtp_destin(conn_dst) != 0) + if (check_rtp_destin(conn_dst) != 0) { + msgb_free(msg); return -1; + } /* Depending on the RTP connection type, deliver the RTP packet to the * destination connection. */ @@ -1021,7 +1035,7 @@ * be discarded, this should not happen, normally the MGCP type * should be properly set */ LOGPENDP(endp, DRTP, LOGL_ERROR, "bad MGCP type -- data discarded!\n"); - + msgb_free(msg); return -1; } @@ -1101,7 +1115,7 @@ return -1; } -/*! Send RTP/RTCP data to a specified destination connection. +/*! Send RTP/RTCP data to a specified destination connection. Takes ownership of msg. * \param[in] endp associated endpoint (for configuration, logging). * \param[in] is_rtp flag to specify if the packet is of type RTP or RTCP. * \param[in] addr spoofed source address (set to NULL to disable). @@ -1140,6 +1154,7 @@ if (is_rtp && !mgcp_conn_rtp_is_iuup(conn_src)) { if (mgcp_patch_pt(conn_dst, msg) < 0) { LOGPENDP(endp, DRTP, LOGL_NOTICE, "unable to patch payload type RTP packet, discarding...\n"); + msgb_free(msg); return -EINVAL; } } @@ -1212,14 +1227,16 @@ len = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, (char *)msgb_data(msg), msgb_length(msg)); - - if (len <= 0) + if (len <= 0) { + msgb_free(msg); return len; + } rtpconn_rate_ctr_inc(conn_dst, endp, RTP_PACKETS_TX_CTR); rtpconn_rate_ctr_add(conn_dst, endp, RTP_OCTETS_TX_CTR, len); rtp_state->alt_rtp_tx_sequence++; + msgb_free(msg); return len; } else if (!trunk->omit_rtcp) { struct osmo_sockaddr rtcp_addr = rtp_end->addr; @@ -1238,12 +1255,44 @@ rtpconn_rate_ctr_add(conn_dst, endp, RTP_OCTETS_TX_CTR, len); rtp_state->alt_rtp_tx_sequence++; + msgb_free(msg); return len; } + msgb_free(msg); return 0; } +/*! determine if there's only a single recipient in endp for data received via conn_src. + * The function returns NULL in case there is no recipient, or in case there are multiple recipients. + * \param endp The MGCP endpoint whose connections to analyze + * \param conn_src The source MGCP connection [which shall not count in results] + * \returns recipient donnection if there is only one; NULL in case there are multiple */ +static struct mgcp_conn *rtpbridge_get_only_recipient(struct mgcp_endpoint *endp, struct mgcp_conn *conn_src) +{ + struct mgcp_conn *conn_ret = NULL; + struct mgcp_conn *conn_dst; + + llist_for_each_entry(conn_dst, &endp->conns, entry) { + if (conn_dst == conn_src) + continue; + switch (conn_dst->mode) { + case MGCP_CONN_SEND_ONLY: + case MGCP_CONN_RECV_SEND: + case MGCP_CONN_CONFECHO: + if (conn_ret) + return NULL; + else + conn_ret = conn_dst; + break; + default: + break; + } + } + + return conn_ret; +} + /*! Dispatch incoming RTP packet to opposite RTP connection. * \param[in] msg Message buffer to bridge, coming from source connection. * msg shall contain "struct osmo_rtp_msg_ctx *" attached in @@ -1301,23 +1350,44 @@ return rc; } - /* If the mode is "confecho", send RTP back to the sender. */ - if (conn->mode == MGCP_CONN_CONFECHO) - rc = mgcp_conn_rtp_dispatch_rtp(conn_src, msg); + /* All the use cases above are 1:1 where we have one source msgb and we're sending that to one + * destination. msgb ownership had been passed to the respective _*dospatch_rtp() function. + * In the cases below, we actually [can] have multiple recipients, so we copy the original msgb + * for each of the recipients. */ - /* Dispatch RTP packet to all other connection(s) that send audio. */ - llist_for_each_entry(conn_dst, &endp->conns, entry) { - if (conn_dst == conn) - continue; - switch (conn_dst->mode) { - case MGCP_CONN_SEND_ONLY: - case MGCP_CONN_RECV_SEND: - case MGCP_CONN_CONFECHO: - rc = mgcp_conn_rtp_dispatch_rtp(&conn_dst->u.rtp, msg); - break; - default: - break; + /* If the mode is "confecho", send RTP back to the sender. */ + if (conn->mode == MGCP_CONN_CONFECHO) { + struct msgb *msg2 = mgw_msgb_copy_c(conn, msg, "RTP confecho"); + if (OSMO_LIKELY(msg2)) + rc = mgcp_conn_rtp_dispatch_rtp(conn_src, msg2); + } + + conn_dst = rtpbridge_get_only_recipient(endp, conn); + if (OSMO_LIKELY(conn_dst)) { + /* we only have a single recipient and cann hence send the original msgb without copying */ + rc = mgcp_conn_rtp_dispatch_rtp(&conn_dst->u.rtp, msg); + } else { + /* Dispatch RTP packet to all other connection(s) that send audio. */ + llist_for_each_entry(conn_dst, &endp->conns, entry) { + struct msgb *msg2; + if (conn_dst == conn) + continue; + switch (conn_dst->mode) { + case MGCP_CONN_SEND_ONLY: + case MGCP_CONN_RECV_SEND: + case MGCP_CONN_CONFECHO: + /* we have multiple recipients and must make copies for each recipient */ + msg2 = mgw_msgb_copy_c(conn_dst, msg, "RTP Tx copy"); + if (OSMO_LIKELY(msg2)) + rc = mgcp_conn_rtp_dispatch_rtp(&conn_dst->u.rtp, msg2); + break; + default: + break; + } } + /* as we only sent copies in the previous llist_for_each_entry() loop, we must free the + * original one */ + msgb_free(msg); } return rc; } @@ -1471,11 +1541,11 @@ rc = rx_rtp(msg); out: - msgb_free(msg); return rc; } -/* Note: This function is able to handle RTP and RTCP */ +/* Note: This function is able to handle RTP and RTCP. msgb ownership is transferred, so this function or its + * downstream consumers must make sure to [eventually] free the msgb. */ static int rx_rtp(struct msgb *msg) { struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); @@ -1488,7 +1558,7 @@ /* Check if the origin of the RTP packet seems plausible */ if (!trunk->rtp_accept_all && check_rtp_origin(conn_src, from_addr)) - return -1; + goto out_free; /* Handle AMR frame format conversion (octet-aligned vs. bandwith-efficient) */ if (mc->proto == MGCP_PROTO_RTP @@ -1498,13 +1568,13 @@ * 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; + goto out_free; if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned) { LOG_CONN_RTP(conn_src, LOGL_NOTICE, "rx_rtp(%u bytes): Expected RTP AMR octet-aligned=%u but got octet-aligned=%u." " check the config of your call-agent!\n", msgb_length(msg), conn_src->end.codec->param.amr_octet_aligned, oa); - return -1; + goto out_free; } } @@ -1513,6 +1583,9 @@ /* Execute endpoint specific implementation that handles the * dispatching of the RTP data */ return conn->endp->type->dispatch_rtp_cb(msg); +out_free: + msgb_free(msg); + return -1; } /*! bind RTP port to osmo_fd. diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 997b07b..70798eb 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -204,14 +204,13 @@ return h->in; } -/*! send RTP packet through OSMUX connection. +/*! send RTP packet through OSMUX connection. Takes ownership of msg. * \param[in] conn associated RTP connection * \param[in] msg msgb containing an RTP AMR packet * \returns 0 on success, -1 on ERROR */ int conn_osmux_send_rtp(struct mgcp_conn_rtp *conn, struct msgb *msg) { int ret; - struct msgb *msg2; if (!conn->end.output_enabled) { rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_DROPPED_CTR); @@ -225,19 +224,14 @@ return -1; } - /* msg is not owned by us and will be freed by the caller stack upon return: */ - msg2 = msgb_copy_c(conn->conn, msg, "osmux-rtp-send"); - if (!msg2) - return -1; - /* Osmux implementation works with AMR OA only, make sure we convert to it if needed: */ - if (amr_oa_bwe_convert(conn->conn->endp, msg2, true) < 0) { + if (amr_oa_bwe_convert(conn->conn->endp, msg, true) < 0) { LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, "Error converting to AMR octet-aligned mode\n"); return -1; } - while ((ret = osmux_xfrm_input(conn->osmux.in, msg2, conn->osmux.remote_cid)) > 0) { + while ((ret = osmux_xfrm_input(conn->osmux.in, msg, conn->osmux.remote_cid)) > 0) { /* batch full, build and deliver it */ osmux_xfrm_input_deliver(conn->osmux.in); } @@ -245,7 +239,7 @@ rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_DROPPED_CTR); } else { rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_CTR); - rtpconn_osmux_rate_ctr_add(conn, OSMUX_AMR_OCTETS_TX_CTR, msgb_length(msg2) - sizeof(struct rtp_hdr)); + rtpconn_osmux_rate_ctr_add(conn, OSMUX_AMR_OCTETS_TX_CTR, msgb_length(msg) - sizeof(struct rtp_hdr)); } return 0; } @@ -325,7 +319,7 @@ }; endp->type->dispatch_rtp_cb(msg); - msgb_free(msg); + /* dispatch_rtp_cb() has taken ownership of the msgb */ } static struct msgb *osmux_recv(struct osmo_fd *ofd, struct osmo_sockaddr *addr) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36361?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6a331f3c6b2eb51ea312ac6ef8c357185ddb79cf Gerrit-Change-Number: 36361 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-remsim[master]: debian/rules: don't compress pdfs

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36359?usp=email ) Change subject: debian/rules: don't compress pdfs ...................................................................... debian/rules: don't compress pdfs Adjust debian packaging as in other Osmocom projects to not compress the pdf files. Related: SYS#6855 Change-Id: I4372c2d93b317a9deaed3650941c7438accf9211 --- M debian/rules 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/59/36359/1 diff --git a/debian/rules b/debian/rules index fddb043..779d944 100755 --- a/debian/rules +++ b/debian/rules @@ -25,3 +25,7 @@ # Print test results in case of a failure #override_dh_auto_test: # dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +# Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers) +override_dh_compress: + dh_compress -X.pdf -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36359?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I4372c2d93b317a9deaed3650941c7438accf9211 Gerrit-Change-Number: 36359 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: simplify unused transcoding/processing call-back

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36357?usp=email ) Change subject: simplify unused transcoding/processing call-back ...................................................................... simplify unused transcoding/processing call-back the processing call-back is working with a raw buffer + length, while we actually work with struct msgb. Let's simply pass the msgb into the call-back, and the call-back can then do what they want with the contents of that msgb. Change-Id: I002624f9008726e3d754d48aa2282c38e3b42953 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_network.c 3 files changed, 20 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/57/36357/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 42d67cf..bfb412b 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -70,12 +70,10 @@ /** * Return: * < 0 in case no audio was processed - * >= 0 in case audio was processed. The remaining payload - * length will be returned. + * >= 0 in case audio was processed. */ typedef int (*mgcp_processing)(struct mgcp_endpoint *endp, - struct mgcp_rtp_end *dst_end, - char *data, int *len, int buf_size); + struct mgcp_rtp_end *dst_end, struct msgb *msg); struct mgcp_conn_rtp; diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index a7bd333..1ec8979 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -159,8 +159,7 @@ int mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); /* payload processing default functions */ -int mgcp_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_rtp_end *dst_end, - char *data, int *len, int buf_size); +int mgcp_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_rtp_end *dst_end, struct msgb *msg); int mgcp_setup_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn_dst, diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 31c02d2..4e5b307 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -404,13 +404,11 @@ /*! dummy callback to disable transcoding (see also cfg->rtp_processing_cb). * \param[in] associated endpoint. * \param[in] destination RTP end. - * \param[in,out] pointer to buffer with voice data. - * \param[in] voice data length. - * \param[in] maximum size of caller provided voice data buffer. + * \param[in,out] msg message bufffer containing data. Function might change length. * \returns ignores input parameters, return always 0. */ int mgcp_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_rtp_end *dst_end, - char *data, int *len, int buf_size) + struct msgb *msg) { LOGPENDP(endp, DRTP, LOGL_DEBUG, "transcoding disabled\n"); return 0; @@ -1168,14 +1166,12 @@ osmo_sockaddr_port(&rtp_end->addr.u.sa), ntohs(rtp_end->rtcp_port) ); } else if (is_rtp) { - int buflen = msgb_length(msg); - /* Make sure we have a valid RTP header, in cases where no RTP * header is present, we will generate one. */ gen_rtp_header(msg, rtp_end, rtp_state); /* Run transcoder */ - rc = endp->trunk->cfg->rtp_processing_cb(endp, rtp_end, (char *)msgb_data(msg), &buflen, RTP_BUF_SIZE); + rc = endp->trunk->cfg->rtp_processing_cb(endp, rtp_end, msg); if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "Error %d during transcoding\n", rc); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36357?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I002624f9008726e3d754d48aa2282c38e3b42953 Gerrit-Change-Number: 36357 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: remove strange loop for non-existant transcoding support

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36356?usp=email ) Change subject: remove strange loop for non-existant transcoding support ...................................................................... remove strange loop for non-existant transcoding support The existing support preparing the mgw for transcoding (which doesn't exist) has some kind of method where the transcoding function might be called multiple times in a row. However, as it is not used, it is not entirely clear how it was intended to work. Let's remove this unused looping feature which makes it hard to understand how upcoming osmo_io should deal with it. Change-Id: Ie1a629fd31c5ab806fc929d1e6b279c4be5b8246 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 59 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/56/36356/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 111c5cf..31c02d2 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1168,70 +1168,64 @@ osmo_sockaddr_port(&rtp_end->addr.u.sa), ntohs(rtp_end->rtcp_port) ); } else if (is_rtp) { - int cont; - int nbytes = 0; int buflen = msgb_length(msg); /* Make sure we have a valid RTP header, in cases where no RTP * header is present, we will generate one. */ gen_rtp_header(msg, rtp_end, rtp_state); - do { - /* Run transcoder */ - cont = endp->trunk->cfg->rtp_processing_cb(endp, rtp_end, (char *)msgb_data(msg), &buflen, RTP_BUF_SIZE); - if (cont < 0) - break; + /* Run transcoder */ + rc = endp->trunk->cfg->rtp_processing_cb(endp, rtp_end, (char *)msgb_data(msg), &buflen, RTP_BUF_SIZE); + if (rc < 0) { + LOGPENDP(endp, DRTP, LOGL_ERROR, "Error %d during transcoding\n", rc); + return rc; + } - if (addr) - mgcp_patch_and_count(endp, rtp_state, rtp_end, - addr, msg); + if (addr) + mgcp_patch_and_count(endp, rtp_state, rtp_end, addr, msg); - if (mgcp_conn_rtp_is_iuup(conn_dst) || mgcp_conn_rtp_is_iuup(conn_src)) { - /* the iuup code will correctly transform to the correct AMR mode */ - } else if (mgcp_codec_amr_align_mode_is_indicated(conn_dst->end.codec)) { - rc = amr_oa_bwe_convert(endp, msg, - conn_dst->end.codec->param.amr_octet_aligned); - if (rc < 0) { - LOGPENDP(endp, DRTP, LOGL_ERROR, - "Error in AMR octet-aligned <-> bandwidth-efficient mode conversion (target=%s)\n", - conn_dst->end.codec->param.amr_octet_aligned ? "octet-aligned" : "bandwidth-efficient"); - break; - } - } else if (rtp_end->rfc5993_hr_convert && - strcmp(conn_src->end.codec->subtype_name, "GSM-HR-08") == 0) { - rc = rfc5993_hr_convert(endp, msg); - if (rc < 0) { - LOGPENDP(endp, DRTP, LOGL_ERROR, "Error while converting to GSM-HR-08\n"); - break; - } + if (mgcp_conn_rtp_is_iuup(conn_dst) || mgcp_conn_rtp_is_iuup(conn_src)) { + /* the iuup code will correctly transform to the correct AMR mode */ + } else if (mgcp_codec_amr_align_mode_is_indicated(conn_dst->end.codec)) { + rc = amr_oa_bwe_convert(endp, msg, conn_dst->end.codec->param.amr_octet_aligned); + if (rc < 0) { + LOGPENDP(endp, DRTP, LOGL_ERROR, + "Error in AMR octet-aligned <-> bandwidth-efficient mode conversion (target=%s)\n", + conn_dst->end.codec->param.amr_octet_aligned ? "octet-aligned" : "bandwidth-efficient"); + return rc; } + } else if (rtp_end->rfc5993_hr_convert && + strcmp(conn_src->end.codec->subtype_name, "GSM-HR-08") == 0) { + rc = rfc5993_hr_convert(endp, msg); + if (rc < 0) { + LOGPENDP(endp, DRTP, LOGL_ERROR, "Error while converting to GSM-HR-08\n"); + return rc; + } + } - LOGPENDP(endp, DRTP, LOGL_DEBUG, - "process/send to %s %s " - "rtp_port:%u rtcp_port:%u\n", - dest_name, - osmo_sockaddr_ntop(&rtp_end->addr.u.sa, ipbuf), - osmo_sockaddr_port(&rtp_end->addr.u.sa), ntohs(rtp_end->rtcp_port) - ); + LOGPENDP(endp, DRTP, LOGL_DEBUG, + "process/send to %s %s " + "rtp_port:%u rtcp_port:%u\n", + dest_name, + osmo_sockaddr_ntop(&rtp_end->addr.u.sa, ipbuf), + osmo_sockaddr_port(&rtp_end->addr.u.sa), ntohs(rtp_end->rtcp_port) + ); - /* Forward a copy of the RTP data to a debug ip/port */ - forward_data_tap(rtp_end->rtp.fd, &conn_src->tap_out, - msg); + /* Forward a copy of the RTP data to a debug ip/port */ + forward_data_tap(rtp_end->rtp.fd, &conn_src->tap_out, + msg); - len = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, - (char *)msgb_data(msg), msgb_length(msg)); + len = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, + (char *)msgb_data(msg), msgb_length(msg)); - if (len <= 0) - return len; + if (len <= 0) + return len; - rtpconn_rate_ctr_inc(conn_dst, endp, RTP_PACKETS_TX_CTR); - rtpconn_rate_ctr_add(conn_dst, endp, RTP_OCTETS_TX_CTR, len); - rtp_state->alt_rtp_tx_sequence++; + rtpconn_rate_ctr_inc(conn_dst, endp, RTP_PACKETS_TX_CTR); + rtpconn_rate_ctr_add(conn_dst, endp, RTP_OCTETS_TX_CTR, len); + rtp_state->alt_rtp_tx_sequence++; - nbytes += len; - buflen = cont; - } while (buflen > 0); - return nbytes; + return len; } else if (!trunk->omit_rtcp) { struct osmo_sockaddr rtcp_addr = rtp_end->addr; osmo_sockaddr_set_port(&rtcp_addr.u.sa, rtp_end->rtcp_port); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36356?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie1a629fd31c5ab806fc929d1e6b279c4be5b8246 Gerrit-Change-Number: 36356 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: don't log useless "transcoding disabled" message

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36358?usp=email ) Change subject: don't log useless "transcoding disabled" message ...................................................................... don't log useless "transcoding disabled" message The entire mgw has no transcoding support. So printing that message is useless to begin with. And printing it for *every RTP packet* is even more useless. Let's remove it. Change-Id: If0ee2607404afc3a00665a5cf22a9e0eb62eb476 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/58/36358/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 4e5b307..ee25f74 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -410,7 +410,6 @@ struct mgcp_rtp_end *dst_end, struct msgb *msg) { - LOGPENDP(endp, DRTP, LOGL_DEBUG, "transcoding disabled\n"); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36358?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If0ee2607404afc3a00665a5cf22a9e0eb62eb476 Gerrit-Change-Number: 36358 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: Add our usual SIGABRT, SIGUSR1 signal handlers

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36355?usp=email ) Change subject: mgw: Add our usual SIGABRT, SIGUSR1 signal handlers ...................................................................... Patch Set 1: (1 comment) File src/osmo-mgw/mgw_main.c: https://gerrit.osmocom.org/c/osmo-mgw/+/36355/comment/dad0e26a_c7779208 PS1, Line 358: signal(SIGUSR2, &signal_handler); > SIGUSR2 is not used, so probably leave the default one? yes, likely a copy+paste oversight from osmo-bsc, which does it the same way. thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idc35444d2b8a0bc52c267b468dfa3c1b59f9187a Gerrit-Change-Number: 36355 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Mar 2024 17:17:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: Add our usual SIGABRT, SIGUSR1 signal handlers

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-mgw/+/36355?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: mgw: Add our usual SIGABRT, SIGUSR1 signal handlers ...................................................................... mgw: Add our usual SIGABRT, SIGUSR1 signal handlers This is mostly related to talloc reports. Change-Id: Idc35444d2b8a0bc52c267b468dfa3c1b59f9187a --- M src/osmo-mgw/mgw_main.c 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/55/36355/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idc35444d2b8a0bc52c267b468dfa3c1b59f9187a Gerrit-Change-Number: 36355 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: Add our usual SIGABRT, USR1, USR2 signal handlers

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36355?usp=email ) Change subject: mgw: Add our usual SIGABRT, USR1, USR2 signal handlers ...................................................................... Patch Set 1: (1 comment) File src/osmo-mgw/mgw_main.c: https://gerrit.osmocom.org/c/osmo-mgw/+/36355/comment/7b12e1db_204a0d4e PS1, Line 358: signal(SIGUSR2, &signal_handler); SIGUSR2 is not used, so probably leave the default one? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idc35444d2b8a0bc52c267b468dfa3c1b59f9187a Gerrit-Change-Number: 36355 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 19 Mar 2024 16:17:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: Add our usual SIGABRT, USR1, USR2 signal handlers

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36355?usp=email ) Change subject: mgw: Add our usual SIGABRT, USR1, USR2 signal handlers ...................................................................... mgw: Add our usual SIGABRT, USR1, USR2 signal handlers This is mostly related to talloc reports. Change-Id: Idc35444d2b8a0bc52c267b468dfa3c1b59f9187a --- M src/osmo-mgw/mgw_main.c 1 file changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/55/36355/1 diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index 5a62e95..0e85e38 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -280,6 +280,31 @@ return vty->node; } +static void signal_handler(int signum) +{ + fprintf(stdout, "signal %u received\n", signum); + + switch (signum) { + case SIGABRT: + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_mgw_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_mgw_ctx, stderr); + break; + default: + break; + } +} static struct vty_app_info vty_info = { .name = "OsmoMGW", @@ -328,6 +353,9 @@ msgb_talloc_ctx_init(tall_mgw_ctx, 0); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); osmo_init_logging2(tall_mgw_ctx, &log_info); libosmo_abis_init(tall_mgw_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idc35444d2b8a0bc52c267b468dfa3c1b59f9187a Gerrit-Change-Number: 36355 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: Introduce test TC_gy_ccr_update_rejected

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36352?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: pgw: Introduce test TC_gy_ccr_update_rejected ...................................................................... pgw: Introduce test TC_gy_ccr_update_rejected This test currently fails because open5gs-smfd is not triggering the tear down in smf_gy_handle_cca_update_request(). Related: SYS#6845 Change-Id: Ie58ae2a5e870b183fa1c56c90c94f5eee56386e0 --- M pgw/PGW_Tests.ttcn M pgw/expected-results.xml 2 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/36352/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36352?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie58ae2a5e870b183fa1c56c90c94f5eee56386e0 Gerrit-Change-Number: 36352 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli.c: Handle read / recvfrom error and close connection

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email ) Change subject: stream_cli.c: Handle read / recvfrom error and close connection ...................................................................... Patch Set 1: (2 comments) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36354/comment/27610819_33a47847 PS1, Line 453: LOGSCLI(cli, LOGL_INFO, "received result %d in response to read\n", res); LOGL_NOTICE or ERROR https://gerrit.osmocom.org/c/libosmo-netif/+/36354/comment/9a5c87f9_7e578c5b PS1, Line 508: LOGSCLI(cli, LOGL_INFO, "received result %d in response to recvmsg\n", res); LOGL_NOTICE or ERROR -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I55426de6b49cb4cb0797e50dfeae11f2efc29b15 Gerrit-Change-Number: 36354 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 19 Mar 2024 14:46:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pgw: Set Gy CCA Result-Code based on settings

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?usp=email ) Change subject: pgw: Set Gy CCA Result-Code based on settings ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2c3b1057908c1c76a55c41a7f45728a0fdee3cf0 Gerrit-Change-Number: 36344 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 19 Mar 2024 14:43:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: DIAMETER_ts32_299_Templates.ttcn: Define Result codes specified in TS

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36345?usp=email ) Change subject: DIAMETER_ts32_299_Templates.ttcn: Define Result codes specified in TS ...................................................................... DIAMETER_ts32_299_Templates.ttcn: Define Result codes specified in TS Change-Id: I6c102e6a10469d0d054cb55f7d2100c8887ab6e0 --- M library/DIAMETER_ts32_299_Templates.ttcn 1 file changed, 22 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/DIAMETER_ts32_299_Templates.ttcn b/library/DIAMETER_ts32_299_Templates.ttcn index af8f514..c308659 100644 --- a/library/DIAMETER_ts32_299_Templates.ttcn +++ b/library/DIAMETER_ts32_299_Templates.ttcn @@ -18,11 +18,23 @@ import from Misc_Helpers all; /******************************* - * S6a 3GPP TS 32.299 section 7 + * Gy 3GPP TS 32.299 section 7 *******************************/ /* Gy AID : 3GPP TS 32.299 7.1.6, RFC4006 3.1: c_DIAMETER_CREDIT_CONTROL_AID */ +/* 3GPP TS 32.299 7.1.11 Result-Code AVP*/ +type enumerated DIAMETER_ts32_229_Resultcode { + /* transient */ + DIAMETER_END_USER_SERVICE_DENIED (4010), + DIAMETER_CREDIT_CONTROL_NOT_APPLICABLE (4011), + DIAMETER_CREDIT_LIMIT_REACHED (4012), + /* permanent */ + DIAMETER_AUTHORIZATION_REJECTED (5003), + DIAMETER_USER_UNKNOWN (5030), + DIAMETER_RATING_FAILED (5031) +} + /* 3GPP TS 32.299 6.4.2 Credit-Control-Request */ template (present) PDU_DIAMETER tr_DIA_Gy_CCR(template (present) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUEST) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36345?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6c102e6a10469d0d054cb55f7d2100c8887ab6e0 Gerrit-Change-Number: 36345 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: Fix typo in comment

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36343?usp=email ) Change subject: pgw: Fix typo in comment ...................................................................... pgw: Fix typo in comment Change-Id: Ie768044d9f80cc3837685167d98a1e270d0abde4 --- M pgw/PGW_Tests.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 281f816..fb893fc 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -1031,7 +1031,7 @@ d := activate(as_DIA_Gy_CCR(UPDATE_REQUEST)); f_ping4(mp_ping_hostname); - /* Let the CCA reach the GGSN */ + /* Let the CCA reach the PGW */ f_sleep(0.5); deactivate(d); f_validate_gy_cc_report(g_rx_gy, VALIDITY_TIME, (3..4), (28..1000), (28..1000)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36343?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie768044d9f80cc3837685167d98a1e270d0abde4 Gerrit-Change-Number: 36343 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli.c: Handle read / recvfrom error and close connection

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email ) Change subject: stream_cli.c: Handle read / recvfrom error and close connection ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: with those kind of corner cases, it would be great to have some kind of test coverage. I wonder what might be the best way to do this... Probably some kind of LD_PRELOAD wrapper around the related syscalls to provoke some specific error whenever we want that? At least for the osmo_fd case that should work. If any one else has other/better ideas, let me know. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I55426de6b49cb4cb0797e50dfeae11f2efc29b15 Gerrit-Change-Number: 36354 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 19 Mar 2024 14:23:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli.c: Handle read / recvfrom error and close connection

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email ) Change subject: stream_cli.c: Handle read / recvfrom error and close connection ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I55426de6b49cb4cb0797e50dfeae11f2efc29b15 Gerrit-Change-Number: 36354 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 19 Mar 2024 14:22:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: doc: Mention the `gb-dialect` vty option, as it is quite essential

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36220?usp=email ) Change subject: doc: Mention the `gb-dialect` vty option, as it is quite essential ...................................................................... doc: Mention the `gb-dialect` vty option, as it is quite essential We should have introduced this documentation snipped years ago, when first introducing IP-SNS support in libosmogb/osmo-pcu. Change-Id: I83709b7231c2a3930e1b3f09b737319fb7d7e741 --- M doc/manuals/chapters/overview.adoc 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc index 69d0672..45aea53 100644 --- a/doc/manuals/chapters/overview.adoc +++ b/doc/manuals/chapters/overview.adoc @@ -106,6 +106,19 @@ Gb implementation to be used from OsmoPCU, OsmoGbProxy as well as OsmoSGSN. +The Gb Implementation supports two different dialects: + +* `classic` dialect, which implements a non-standard dialect from the days + where Frame Relay was the default and no IP transport had yet been + specified by 3GPP. +* `ip-sns` dialect, which implements the 3GPP standard for NS-over-IP, + including the IP-SNS protocol. + +In case of doubt, and assuming you are directly interfacing to a +modern 3rd party SGSN, use the `ip-sns` dialect. + +Selection of the dialect is done using the `gb-dialect` VTY option at the `pcu` node. + [[pcu_sock_iface]] ==== `pcu_sock` Interface to OsmoBTS/OsmoBSC -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36220?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I83709b7231c2a3930e1b3f09b737319fb7d7e741 Gerrit-Change-Number: 36220 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: doc: Mention the `gb-dialect` vty option, as it is quite essential

by laforge

Attention is currently required from: daniel, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36220?usp=email ) Change subject: doc: Mention the `gb-dialect` vty option, as it is quite essential ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36220?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I83709b7231c2a3930e1b3f09b737319fb7d7e741 Gerrit-Change-Number: 36220 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 19 Mar 2024 13:27:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in osmo-hnbgw[master]: RAB activation/modification/release statistics

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36311?usp=email ) Change subject: RAB activation/modification/release statistics ...................................................................... RAB activation/modification/release statistics Add rate_ctr based statistics for RAB activation, deactivation and failures. This requires us to parse RANAP in both uplink and downlink and to iterate deep into the setup/modify/release/failure lists. Given the way how the protocol works, the only way to distinguish an activation from a modification is because sender and recipient know whether a given RAB is already active at the time of the message. So we also need to track the activation state of each RAB. Depends: osmo-iuh.git Change-Id I328819c650fc6cefe735093a846277b4f03e6b29 Change-Id: I198fa37699e22380909764de6a0522ac79aa1d39 --- M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/context_map.h M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/hnbgw.c A src/osmo-hnbgw/kpi_ranap.c 9 files changed, 504 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnbgw/Makefile.am b/include/osmocom/hnbgw/Makefile.am index b6824b3..6338e4e 100644 --- a/include/osmocom/hnbgw/Makefile.am +++ b/include/osmocom/hnbgw/Makefile.am @@ -2,6 +2,7 @@ vty.h \ context_map.h hnbgw.h hnbgw_cn.h \ hnbgw_hnbap.h hnbgw_rua.h hnbgw_ranap.h \ + kpi.h \ ranap_rab_ass.h mgw_fsm.h tdefs.h \ hnbgw_pfcp.h \ ps_rab_ass_fsm.h \ diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index d401635..1e23777 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -101,6 +101,14 @@ bool from_other_plmn; }; +/* used in hnbgw_context_map.rab_state[] */ +enum rab_state { + RAB_STATE_INACTIVE, + RAB_STATE_ACT_REQ, + RAB_STATE_ACTIVE, + RAB_STATE_REL_REQ, +}; + struct hnbgw_context_map { /* entry in the per-CN list of mappings */ struct llist_head hnbgw_cnlink_entry; @@ -160,6 +168,9 @@ * communication for one particular RAB ID. */ struct llist_head ps_rabs; + /* RAB state tracking. As RAB-ID is an 8-bit integer, we need 256 elements in the array */ + uint8_t rab_state[256]; + /* Flag to prevent calling context_map_free() from cleanup code paths triggered by context_map_free() itself. */ bool deallocating; }; diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index bd8a853..b3ba3b2 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -80,6 +80,36 @@ HNB_CTR_RANAP_PS_RESET_REQ_UL, HNB_CTR_RANAP_CS_RESET_REQ_UL, + HNB_CTR_RANAP_PS_RAB_ACT_REQ, + HNB_CTR_RANAP_CS_RAB_ACT_REQ, + + HNB_CTR_RANAP_PS_RAB_ACT_CNF, + HNB_CTR_RANAP_CS_RAB_ACT_CNF, + + HNB_CTR_RANAP_PS_RAB_ACT_FAIL, + HNB_CTR_RANAP_CS_RAB_ACT_FAIL, + + HNB_CTR_RANAP_PS_RAB_MOD_REQ, + HNB_CTR_RANAP_CS_RAB_MOD_REQ, + + HNB_CTR_RANAP_PS_RAB_MOD_CNF, + HNB_CTR_RANAP_CS_RAB_MOD_CNF, + + HNB_CTR_RANAP_PS_RAB_MOD_FAIL, + HNB_CTR_RANAP_CS_RAB_MOD_FAIL, + + HNB_CTR_RANAP_PS_RAB_REL_REQ, + HNB_CTR_RANAP_CS_RAB_REL_REQ, + + HNB_CTR_RANAP_PS_RAB_REL_CNF, + HNB_CTR_RANAP_CS_RAB_REL_CNF, + + HNB_CTR_RANAP_PS_RAB_REL_FAIL, + HNB_CTR_RANAP_CS_RAB_REL_FAIL, + + HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT, + HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT, + HNB_CTR_RUA_ERR_IND, HNB_CTR_RUA_PS_CONNECT_UL, @@ -301,6 +331,7 @@ #define HNBP_CTR(hnbp, x) rate_ctr_group_get_ctr((hnbp)->ctrs, x) #define HNBP_CTR_INC(hnbp, x) rate_ctr_inc(HNBP_CTR(hnbp, x)) +#define HNBP_CTR_ADD(hnbp, x, y) rate_ctr_add2((hnbp)->ctrs, x, y) #define HNBP_STAT(hbp, x) osmo_stat_item_group_get_item((hnbp)->statg, x) #define HNBP_STAT_SET(hnbp, x, val) osmo_stat_item_set(HNBP_STAT(hnbp, x), val) diff --git a/include/osmocom/hnbgw/kpi.h b/include/osmocom/hnbgw/kpi.h new file mode 100644 index 0000000..63f3477 --- /dev/null +++ b/include/osmocom/hnbgw/kpi.h @@ -0,0 +1,8 @@ +#pragma once + +#include <osmocom/ranap/ranap_ies_defs.h> + +#include <osmocom/hnbgw/hnbgw.h> + +void kpi_ranap_process_ul(struct hnbgw_context_map *map, ranap_message *ranap); +void kpi_ranap_process_dl(struct hnbgw_context_map *map, ranap_message *ranap); diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am index 910fdda..0727f30 100644 --- a/src/osmo-hnbgw/Makefile.am +++ b/src/osmo-hnbgw/Makefile.am @@ -44,6 +44,7 @@ cnlink.c \ ranap_rab_ass.c \ mgw_fsm.c \ + kpi_ranap.c \ tdefs.c \ $(NULL) diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index 2263792..a943a64 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -36,6 +36,7 @@ #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/hnbgw/mgw_fsm.h> #include <osmocom/hnbgw/ps_rab_ass_fsm.h> +#include <osmocom/hnbgw/kpi.h> enum map_rua_fsm_state { MAP_RUA_ST_INIT, @@ -168,6 +169,8 @@ LOGPFSML(fi, LOGL_DEBUG, "rx from RUA: RANAP %s\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); + kpi_ranap_process_ul(map, message); + switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_handle_rab_ass_resp() takes ownership of prim->oph and (ranap) message */ @@ -182,6 +185,8 @@ LOGPFSML(fi, LOGL_DEBUG, "rx from RUA: RANAP %s\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); + kpi_ranap_process_ul(map, message); + switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* ps_rab_ass_fsm takes ownership of prim->oph and RANAP message */ diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 5eb97e2..e7e27b6 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -38,6 +38,7 @@ #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/mgw_fsm.h> #include <osmocom/hnbgw/ps_rab_ass_fsm.h> +#include <osmocom/hnbgw/kpi.h> enum map_sccp_fsm_state { MAP_SCCP_ST_INIT, @@ -215,6 +216,8 @@ LOGPFSML(fi, LOGL_DEBUG, "rx from SCCP: RANAP %s\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); + kpi_ranap_process_dl(map, message); + switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_alloc_and_handle_rab_ass_req() takes ownership of (ranap) message */ @@ -239,6 +242,8 @@ LOGPFSML(fi, LOGL_DEBUG, "rx from SCCP: RANAP %s\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); + kpi_ranap_process_dl(map, message); + switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index e1bac5f..fff900a 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -364,6 +364,59 @@ [HNB_CTR_RANAP_CS_RESET_REQ_UL] = { "ranap:cs:reset_req:ul", "Received RESET Requests in Uplink (CS Domain)" }, + + [HNB_CTR_RANAP_PS_RAB_ACT_REQ] = { + "ranap:ps:rab_act:req", "PS RAB Activations requested" }, + [HNB_CTR_RANAP_CS_RAB_ACT_REQ] = { + "ranap:cs:rab_act:req", "CS RAB Activations requested" }, + + [HNB_CTR_RANAP_PS_RAB_ACT_CNF] = { + "ranap:ps:rab_act:cnf", "PS RAB Activations confirmed" }, + [HNB_CTR_RANAP_CS_RAB_ACT_CNF] = { + "ranap:cs:rab_act:cnf", "CS RAB Activations confirmed" }, + + [HNB_CTR_RANAP_PS_RAB_ACT_FAIL] = { + "ranap:ps:rab_act:fail", "PS RAB Activations failed" }, + [HNB_CTR_RANAP_CS_RAB_ACT_FAIL] = { + "ranap:cs:rab_act:fail", "CS RAB Activations failed" }, + + + [HNB_CTR_RANAP_PS_RAB_MOD_REQ] = { + "ranap:ps:rab_mod:req", "PS RAB Modifications requested" }, + [HNB_CTR_RANAP_CS_RAB_MOD_REQ] = { + "ranap:cs:rab_mod:req", "CS RAB Modifications requested" }, + + [HNB_CTR_RANAP_PS_RAB_MOD_CNF] = { + "ranap:ps:rab_mod:cnf", "PS RAB Modifications confirmed" }, + [HNB_CTR_RANAP_CS_RAB_MOD_CNF] = { + "ranap:cs:rab_mod:cnf", "CS RAB Modifications confirmed" }, + + [HNB_CTR_RANAP_PS_RAB_MOD_FAIL] = { + "ranap:ps:rab_mod:fail", "PS RAB Modifications failed" }, + [HNB_CTR_RANAP_CS_RAB_MOD_FAIL] = { + "ranap:cs:rab_mod:fail", "CS RAB Modifications failed" }, + + + [HNB_CTR_RANAP_PS_RAB_REL_REQ] = { + "ranap:ps:rab_rel:req", "PS RAB Release requested" }, + [HNB_CTR_RANAP_CS_RAB_REL_REQ] = { + "ranap:cs:rab_rel:req", "CS RAB Release requested" }, + + [HNB_CTR_RANAP_PS_RAB_REL_CNF] = { + "ranap:ps:rab_rel:cnf", "PS RAB Release confirmed" }, + [HNB_CTR_RANAP_CS_RAB_REL_CNF] = { + "ranap:cs:rab_rel:cnf", "CS RAB Release confirmed" }, + + [HNB_CTR_RANAP_PS_RAB_REL_FAIL] = { + "ranap:ps:rab_rel:fail", "PS RAB Release failed" }, + [HNB_CTR_RANAP_CS_RAB_REL_FAIL] = { + "ranap:cs:rab_rel:fail", "CS RAB Release failed" }, + + [HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT] = { + "ranap:ps:rab_rel:implicit", "PS RAB Release implicit (during Iu Release)" }, + [HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT] = { + "ranap:cs:rab_rel:implicit", "CS RAB Release implicit (during Iu Release)" }, + [HNB_CTR_RUA_ERR_IND] = { "rua:error_ind", "Received RUA Error Indications" }, diff --git a/src/osmo-hnbgw/kpi_ranap.c b/src/osmo-hnbgw/kpi_ranap.c new file mode 100644 index 0000000..76f6e22 --- /dev/null +++ b/src/osmo-hnbgw/kpi_ranap.c @@ -0,0 +1,370 @@ +/* KPI (statistics, counters) at RANAP level */ +/* (C) 2024 by Harald Welte <laforge(a)osmocom.org> + * All Rights Reserved + * + * SPDX-License-Identifier: 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/>. + */ + +#include "config.h" + +#include <osmocom/core/utils.h> + +#include <osmocom/ranap/ranap_common_ran.h> + +#include <osmocom/hnbgw/hnbgw_cn.h> +#include <osmocom/hnbgw/context_map.h> +#include <osmocom/hnbgw/kpi.h> + + +/*********************************************************************** + * DOWNLINK messages + ***********************************************************************/ + +static void kpi_ranap_process_dl_iu_rel_cmd(struct hnbgw_context_map *map, const ranap_message *ranap) +{ + struct hnb_persistent *hnbp = map->hnb_ctx->persistent; + + OSMO_ASSERT(ranap->procedureCode == RANAP_ProcedureCode_id_Iu_Release); + + /* When Iu is released, all RABs are released implicitly */ + for (unsigned int i = 0; i < ARRAY_SIZE(map->rab_state); i++) { + switch (map->rab_state[i]) { + case RAB_STATE_ACTIVE: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_IMPLICIT : HNB_CTR_RANAP_CS_RAB_REL_IMPLICIT); + break; + } + } + /* clear all RAB state */ + memset(map->rab_state, 0, sizeof(map->rab_state)); +} + +static void kpi_ranap_process_dl_rab_ass_req(struct hnbgw_context_map *map, ranap_message *ranap) +{ + struct hnb_persistent *hnbp = map->hnb_ctx->persistent; + RANAP_RAB_AssignmentRequestIEs_t *ies; + int rc; + + OSMO_ASSERT(ranap->procedureCode == RANAP_ProcedureCode_id_RAB_Assignment); + + ies = &ranap->msg.raB_AssignmentRequestIEs; + + if (ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT) { + RANAP_RAB_SetupOrModifyList_t *som_list = &ies->raB_SetupOrModifyList; + for (unsigned int i = 0; i < som_list->list.count; i++) { + RANAP_ProtocolIE_ContainerPair_t *container_pair = som_list->list.array[i]; + RANAP_ProtocolIE_FieldPair_t *field_pair = container_pair->list.array[0]; + RANAP_RAB_SetupOrModifyItemFirst_t _rab_setup_or_modify_item_first = {}; + RANAP_RAB_SetupOrModifyItemFirst_t *rab_setup_or_modify_item_first = &_rab_setup_or_modify_item_first; + uint8_t rab_id; + + if (!field_pair) + continue; + + if (field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) + continue; + + rc = ranap_decode_rab_setupormodifyitemfirst(rab_setup_or_modify_item_first, &field_pair->firstValue); + if (rc < 0) + continue; + + /* RAB-ID is an 8-bit bit-string, so it's the first byte */ + rab_id = rab_setup_or_modify_item_first->rAB_ID.buf[0]; + + /* the only way to distinguish a "setup" from a "modify" is to know which RABs are + * already established. If it's already established, it is a modification; if it's + * new, it is a setup */ + switch (map->rab_state[rab_id]) { + case RAB_STATE_ACTIVE: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_REQ : HNB_CTR_RANAP_CS_RAB_MOD_REQ); + break; + case RAB_STATE_INACTIVE: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_REQ : HNB_CTR_RANAP_CS_RAB_ACT_REQ); + map->rab_state[rab_id] = RAB_STATE_ACT_REQ; + break; + default: + LOG_MAP(map, DRANAP, LOGL_NOTICE, + "Unexpected RAB Activation/Modification Req for RAB in state %u\n", map->rab_state[rab_id]); + break; + } + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, rab_setup_or_modify_item_first); + } + } + + if (ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_RELEASELIST_PRESENT) { + RANAP_RAB_ReleaseList_t *r_list = &ies->raB_ReleaseList; + /* increment number of released RABs, we don't need to do that individually during iteration */ + HNBP_CTR_ADD(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_REQ : HNB_CTR_RANAP_CS_RAB_REL_REQ, + r_list->raB_ReleaseList_ies.list.count); + + for (unsigned int i = 0; i < r_list->raB_ReleaseList_ies.list.count; i++) { + RANAP_IE_t *release_list_ie = r_list->raB_ReleaseList_ies.list.array[i]; + RANAP_RAB_ReleaseItemIEs_t _rab_rel_item_ies = {}; + RANAP_RAB_ReleaseItemIEs_t *rab_rel_item_ies = &_rab_rel_item_ies; + RANAP_RAB_ReleaseItem_t *rab_rel_item; + uint8_t rab_id; + + if (!release_list_ie) + continue; + + if (release_list_ie->id != RANAP_ProtocolIE_ID_id_RAB_ReleaseItem) + continue; + + rc = ranap_decode_rab_releaseitemies_fromlist(rab_rel_item_ies, &release_list_ie->value); + if (rc < 0) + continue; + + rab_rel_item = &rab_rel_item_ies->raB_ReleaseItem; + /* RAB-ID is an 8-bit bit-string, so it's the first byte */ + rab_id = rab_rel_item->rAB_ID.buf[0]; + + switch (map->rab_state[rab_id]) { + case RAB_STATE_ACTIVE: + break; + default: + LOG_MAP(map, DRANAP, LOGL_NOTICE, + "Unexpected RAB Release Req in state %u\n", map->rab_state[rab_id]); + break; + } + /* mark that RAB as release requested */ + map->rab_state[rab_id] = RAB_STATE_REL_REQ; + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_ReleaseItem, rab_rel_item_ies); + } + } +} + +void kpi_ranap_process_dl(struct hnbgw_context_map *map, ranap_message *ranap) +{ + switch (ranap->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: /* RAB ASSIGNMENT REQ (8.2) */ + kpi_ranap_process_dl_rab_ass_req(map, ranap); + break; + case RANAP_ProcedureCode_id_Iu_Release: + kpi_ranap_process_dl_iu_rel_cmd(map, ranap); /* IU RELEASE CMD (8.5) */ + break; + default: + break; + } +} + +/*********************************************************************** + * UPLINK messages + ***********************************************************************/ + +static void kpi_ranap_process_ul_rab_ass_resp(struct hnbgw_context_map *map, ranap_message *ranap) +{ + struct hnb_persistent *hnbp = map->hnb_ctx->persistent; + RANAP_RAB_AssignmentResponseIEs_t *ies; + int rc; + + OSMO_ASSERT(ranap->procedureCode == RANAP_ProcedureCode_id_RAB_Assignment); + + ies = &ranap->msg.raB_AssignmentResponseIEs; + + if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT) { + RANAP_RAB_SetupOrModifiedList_t *som_list = &ies->raB_SetupOrModifiedList; + for (unsigned int i = 0; i < som_list->raB_SetupOrModifiedList_ies.list.count; i++) { + RANAP_IE_t *som_list_ie = som_list->raB_SetupOrModifiedList_ies.list.array[i]; + RANAP_RAB_SetupOrModifiedItemIEs_t _rab_som_item_ies = {}; + RANAP_RAB_SetupOrModifiedItemIEs_t *rab_som_item_ies = &_rab_som_item_ies; + RANAP_RAB_SetupOrModifiedItem_t *rab_som_item; + uint8_t rab_id; + + if (!som_list_ie) + continue; + + if (som_list_ie->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifiedItem) + continue; + + rc = ranap_decode_rab_setupormodifieditemies_fromlist(rab_som_item_ies, &som_list_ie->value); + if (rc < 0) + continue; + + rab_som_item = &rab_som_item_ies->raB_SetupOrModifiedItem; + /* RAB-ID is an 8-bit bit-string, so it's the first byte */ + rab_id = rab_som_item->rAB_ID.buf[0]; + + /* differentiate modify / activate */ + switch (map->rab_state[rab_id]) { + case RAB_STATE_ACT_REQ: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_CNF : HNB_CTR_RANAP_CS_RAB_ACT_CNF); + map->rab_state[rab_id] = RAB_STATE_ACTIVE; + break; + case RAB_STATE_ACTIVE: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_CNF : HNB_CTR_RANAP_CS_RAB_MOD_CNF); + break; + default: + LOG_MAP(map, DRANAP, LOGL_NOTICE, + "Unexpected RAB Activation/Modification Conf for RAB in state %u\n", map->rab_state[rab_id]); + break; + } + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, rab_som_item_ies); + } + } + + if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_RELEASEDLIST_PRESENT) { + RANAP_RAB_ReleasedList_t *r_list = &ies->raB_ReleasedList; + /* increment number of released RABs, we don't need to do that individually during iteration */ + HNBP_CTR_ADD(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_CNF : HNB_CTR_RANAP_CS_RAB_REL_CNF, + r_list->raB_ReleasedList_ies.list.count); + for (unsigned int i = 0; i < r_list->raB_ReleasedList_ies.list.count; i++) { + RANAP_IE_t *released_list_ie = r_list->raB_ReleasedList_ies.list.array[i]; + RANAP_RAB_ReleasedItemIEs_t _rab_rel_item_ies = {}; + RANAP_RAB_ReleasedItemIEs_t *rab_rel_item_ies = &_rab_rel_item_ies; + RANAP_RAB_ReleasedItem_t *rab_rel_item; + uint8_t rab_id; + + if (!released_list_ie) + continue; + + if (released_list_ie->id != RANAP_ProtocolIE_ID_id_RAB_ReleasedItem) + continue; + + rc = ranap_decode_rab_releaseditemies_fromlist(rab_rel_item_ies, &released_list_ie->value); + if (rc < 0) + continue; + + rab_rel_item = &rab_rel_item_ies->raB_ReleasedItem; + /* RAB-ID is an 8-bit bit-string, so it's the first byte */ + rab_id = rab_rel_item->rAB_ID.buf[0]; + + switch (map->rab_state[rab_id]) { + case RAB_STATE_REL_REQ: + break; + default: + LOG_MAP(map, DRANAP, LOGL_NOTICE, + "Unexpected RAB Release Conf for RAB in state %u\n", map->rab_state[rab_id]); + break; + } + /* mark that RAB as released */ + map->rab_state[rab_id] = RAB_STATE_INACTIVE; + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_ReleasedItem, rab_rel_item_ies); + } + } + + if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_QUEUEDLIST_PRESENT) + LOG_MAP(map, DRANAP, LOGL_NOTICE, "RAB Activation has been queued; we don't support KPIs for this\n"); + + if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_FAILEDLIST_PRESENT) { + RANAP_RAB_FailedList_t *f_list = &ies->raB_FailedList; + for (unsigned int i = 0; i < f_list->raB_FailedList_ies.list.count; i++) { + RANAP_IE_t *failed_list_ie = f_list->raB_FailedList_ies.list.array[i]; + RANAP_RAB_FailedItemIEs_t _rab_failed_item_ies = {}; + RANAP_RAB_FailedItemIEs_t *rab_failed_item_ies = &_rab_failed_item_ies; + RANAP_RAB_FailedItem_t *rab_failed_item; + uint8_t rab_id; + + if (!failed_list_ie) + continue; + + if (failed_list_ie->id != RANAP_ProtocolIE_ID_id_RAB_FailedItem) + continue; + + rc = ranap_decode_rab_faileditemies_fromlist(rab_failed_item_ies, &failed_list_ie->value); + if (rc < 0) + continue; + + rab_failed_item = &rab_failed_item_ies->raB_FailedItem; + /* RAB-ID is an 8-bit bit-string, so it's the first byte */ + rab_id = rab_failed_item->rAB_ID.buf[0]; + + /* differentiate modify / activate */ + switch (map->rab_state[rab_id]) { + case RAB_STATE_ACT_REQ: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL : HNB_CTR_RANAP_CS_RAB_ACT_FAIL); + map->rab_state[rab_id] = RAB_STATE_INACTIVE; + break; + case RAB_STATE_ACTIVE: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_FAIL : HNB_CTR_RANAP_CS_RAB_MOD_FAIL); + // FIXME: does it remain active after modification failure? + break; + default: + LOG_MAP(map, DRANAP, LOGL_NOTICE, + "Unexpected RAB Activation/Modification Failed for RAB in state %u\n", map->rab_state[rab_id]); + break; + } + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_FailedItem, rab_failed_item_ies); + } + } + + if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_RELEASEFAILEDLIST_PRESENT) { + RANAP_RAB_ReleaseFailedList_t *rf_list = &ies->raB_ReleaseFailedList; + /* increment number of released RABs, we don't need to do that individually during iteration */ + HNBP_CTR_ADD(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_REL_FAIL : HNB_CTR_RANAP_CS_RAB_REL_FAIL, + rf_list->raB_FailedList_ies.list.count); + for (unsigned int i = 0; i < rf_list->raB_FailedList_ies.list.count; i++) { + RANAP_IE_t *failed_list_ie = rf_list->raB_FailedList_ies.list.array[i]; + RANAP_RAB_FailedItemIEs_t _rab_failed_item_ies = {}; + RANAP_RAB_FailedItemIEs_t *rab_failed_item_ies = &_rab_failed_item_ies; + RANAP_RAB_FailedItem_t *rab_failed_item; + uint8_t rab_id; + + if (!failed_list_ie) + continue; + + if (failed_list_ie->id != RANAP_ProtocolIE_ID_id_RAB_FailedItem) + continue; + + rc = ranap_decode_rab_faileditemies_fromlist(rab_failed_item_ies, &failed_list_ie->value); + if (rc < 0) + continue; + + rab_failed_item = &rab_failed_item_ies->raB_FailedItem; + /* RAB-ID is an 8-bit bit-string, so it's the first byte */ + rab_id = rab_failed_item->rAB_ID.buf[0]; + + /* differentiate modify / activate */ + switch (map->rab_state[rab_id]) { + case RAB_STATE_ACT_REQ: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_ACT_FAIL : HNB_CTR_RANAP_CS_RAB_ACT_FAIL); + map->rab_state[rab_id] = RAB_STATE_INACTIVE; + break; + case RAB_STATE_ACTIVE: + HNBP_CTR_INC(hnbp, map->is_ps ? HNB_CTR_RANAP_PS_RAB_MOD_FAIL : HNB_CTR_RANAP_CS_RAB_MOD_FAIL); + // FIXME: does it remain active after modification failure? + break; + default: + LOG_MAP(map, DRANAP, LOGL_NOTICE, + "Unexpected RAB Release Failed for RAB in state %u\n", map->rab_state[rab_id]); + break; + } + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_FailedItem, rab_failed_item_ies); + + } + } +} + +void kpi_ranap_process_ul(struct hnbgw_context_map *map, ranap_message *ranap) +{ + switch (ranap->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: /* RAB ASSIGNMENT REQ (8.2) */ + kpi_ranap_process_ul_rab_ass_resp(map, ranap); + break; + case RANAP_ProcedureCode_id_Iu_Release: + /* TODO: We might want to parse the list of released RABs here and then mark each of those as + * released. For now we simply assume that all RABs are released in IU RELEASE during + * processing of the downlink Iu Release Command. It's not like the RNC/HNB has any way to + * refuse the release anyway. */ + break; + default: + break; + } +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36311?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I198fa37699e22380909764de6a0522ac79aa1d39 Gerrit-Change-Number: 36311 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[L] Change in osmo-hnbgw[master]: RAB activation/modification/release statistics

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36311?usp=email ) Change subject: RAB activation/modification/release statistics ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36311?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I198fa37699e22380909764de6a0522ac79aa1d39 Gerrit-Change-Number: 36311 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Mar 2024 13:24:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmo-netif[master]: docs: Improve/clean-up doxygen for datagram.[ch]

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36300?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: docs: Improve/clean-up doxygen for datagram.[ch] ...................................................................... docs: Improve/clean-up doxygen for datagram.[ch] * make sure datagram.h is part of the group * don't expose private #defines from C files to API documentation Change-Id: I64a9ee3306bcc01ba785da476aea581ce31150bd --- M include/osmocom/netif/datagram.h M src/datagram.c 2 files changed, 30 insertions(+), 10 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/netif/datagram.h b/include/osmocom/netif/datagram.h index a0ff7b4..a9bc588 100644 --- a/include/osmocom/netif/datagram.h +++ b/include/osmocom/netif/datagram.h @@ -1,6 +1,19 @@ #ifndef _OSMO_DGRAM_H_ #define _OSMO_DGRAM_H_ +/*! \defgroup datagram Osmocom Datagram Socket + * @{ + * + * This code is intended to abstract any use of datagram type sockets, + * such as UDP. It offers both transmitter and receiver side + * implementations, fully integrated with the libosmocore select loop + * abstraction. + */ + +/*! \file datagram.h + * \brief Osmocom datagram socket helpers + */ + struct osmo_dgram_tx; struct osmo_dgram_tx *osmo_dgram_tx_create(void *ctx); diff --git a/src/datagram.c b/src/datagram.c index afae3e7..9df0630 100644 --- a/src/datagram.c +++ b/src/datagram.c @@ -41,13 +41,12 @@ #include <osmocom/netif/datagram.h> -/*! \addtogroup datagram Osmocom Datagram Socket +#define OSMO_DGRAM_CLI_F_RECONF (1 << 0) + +#define OSMO_DGRAM_RX_F_RECONF (1 << 0) + +/*! \addtogroup datagram * @{ - * - * This code is intended to abstract any use of datagram type sockets, - * such as UDP. It offers both transmitter and receiver side - * implementations, fully integrated with the libosmocore select loop - * abstraction. */ /*! \file datagram.c @@ -59,8 +58,6 @@ * Client side. */ -#define OSMO_DGRAM_CLI_F_RECONF (1 << 0) - struct osmo_dgram_tx { struct osmo_fd ofd; struct llist_head tx_queue; @@ -243,8 +240,6 @@ * Server side. */ -#define OSMO_DGRAM_RX_F_RECONF (1 << 0) - struct osmo_dgram_rx { struct osmo_fd ofd; char *addr; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36300?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I64a9ee3306bcc01ba785da476aea581ce31150bd Gerrit-Change-Number: 36300 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[M] Change in libosmo-netif[master]: docs: various osmux API documentation updates

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36299?usp=email ) Change subject: docs: various osmux API documentation updates ...................................................................... docs: various osmux API documentation updates Let's make sure * only exported / user-relevant #defines appear in the manual * deprecated functions are marked in a way doxygen can mark them * descriptive comments are using doxygen syntax Change-Id: I5af0133322ddd5345a13380f1c007474c0bea117 --- M include/osmocom/netif/osmux.h M src/osmux.c M src/osmux_input.c M src/osmux_output.c 4 files changed, 56 insertions(+), 40 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index 609ca3b..8a8bf88 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -15,7 +15,8 @@ #define OSMUX_DEFAULT_PORT 1984 -/* OSmux header: +/*! \struct osmux_hdr + * OSmux header: * * rtp_m (1 bit): RTP M field (RFC3550, RFC4867) * ft (2 bits): 0=signalling, 1=voice, 2=dummy @@ -32,6 +33,7 @@ #define OSMUX_FT_VOICE_AMR 1 #define OSMUX_FT_DUMMY 2 +/*! Osmux protocol header */ struct osmux_hdr { #if OSMO_IS_LITTLE_ENDIAN uint8_t amr_q:1, @@ -56,9 +58,9 @@ uint8_t data[0]; } __attribute__((packed)); -/* one to handle all existing RTP flows */ +/*! one to handle all existing RTP flows */ struct osmux_in_handle { - /* Initial Osmux seqnum for each circuit, set during osmux_xfrm_input_open_circuit() */ + /*! Initial Osmux seqnum for each circuit, set during osmux_xfrm_input_open_circuit() */ uint8_t osmux_seq; uint8_t batch_factor; uint16_t batch_size; @@ -79,7 +81,7 @@ typedef struct msgb *(*rtp_msgb_alloc_cb_t)(void *rtp_msgb_alloc_priv_data, unsigned int msg_len); -/* one per OSmux circuit_id, ie. one per RTP flow. */ +/*! one per OSmux circuit_id, ie. one per RTP flow. */ struct osmux_out_handle { uint16_t rtp_seq; uint32_t rtp_timestamp; @@ -94,6 +96,7 @@ void *rtp_msgb_alloc_cb_data; /* Opaque data pointer set by user and passed in rtp_msgb_alloc_cb() */ }; +/*! return pointer to osmux payload (behind osmux_hdr) */ static inline uint8_t *osmux_get_payload(struct osmux_hdr *osmuxh) { return (uint8_t *)osmuxh + sizeof(struct osmux_hdr); diff --git a/src/osmux.c b/src/osmux.c index d3294de..999aedd 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -27,6 +27,14 @@ #include <arpa/inet.h> +#define SNPRINTF_BUFFER_SIZE(ret, remain, offset) \ + if (ret < 0) \ + ret = 0; \ + offset += ret; \ + if (ret > remain) \ + ret = remain; \ + remain -= ret; + /*! \addtogroup osmux Osmocom Multiplex Protocol * @{ * @@ -49,14 +57,6 @@ return osmo_amr_bytes(osmuxh->amr_ft) * (osmuxh->ctr+1); } -#define SNPRINTF_BUFFER_SIZE(ret, remain, offset) \ - if (ret < 0) \ - ret = 0; \ - offset += ret; \ - if (ret > remain) \ - ret = remain; \ - remain -= ret; - static int osmux_snprintf_header(char *buf, size_t size, struct osmux_hdr *osmuxh) { unsigned int remain = size, offset = 0; diff --git a/src/osmux_input.c b/src/osmux_input.c index 120f95f..2184a08 100644 --- a/src/osmux_input.c +++ b/src/osmux_input.c @@ -28,23 +28,6 @@ #include <arpa/inet.h> -/*! \addtogroup osmux Osmocom Multiplex Protocol - * @{ - * - * This code implements a variety of utility functions related to the - * OSMUX user-plane multiplexing protocol, an efficient alternative to - * plain UDP/RTP streams for voice transport in back-haul of cellular - * networks. - * - * For information about the OSMUX protocol design, please see the - * OSMUX reference manual at - * http://ftp.osmocom.org/docs/latest/osmux-reference.pdf - */ - -/*! \file osmux_input.c - * \brief Osmocom multiplex protocol helpers (input) - */ - /* This allows you to debug osmux message transformations (spamming) */ #if 0 #define DEBUG_MSG 0 @@ -68,6 +51,22 @@ LOGMUXLK_(link, lvl, "[CID=%" PRIu8 ",batched=%u/%u] " fmt, \ (circuit)->ccid, (circuit)->nmsgs, (link)->h->batch_factor, ## args) +/*! \addtogroup osmux Osmocom Multiplex Protocol + * @{ + * + * This code implements a variety of utility functions related to the + * OSMUX user-plane multiplexing protocol, an efficient alternative to + * plain UDP/RTP streams for voice transport in back-haul of cellular + * networks. + * + * For information about the OSMUX protocol design, please see the + * OSMUX reference manual at + * http://ftp.osmocom.org/docs/latest/osmux-reference.pdf + */ + +/*! \file osmux_input.c + * \brief Osmocom multiplex protocol helpers (input) + */ static void *osmux_ctx; @@ -698,6 +697,7 @@ return 0; } +static unsigned int next_default_name_idx = 0; /*! \brief Allocate a new osmux in handle (osmux source, tx side) * \param[in] ctx talloc context to use when allocating the returned struct * \return Allocated osmux in handle @@ -708,7 +708,6 @@ * stack outgoing network Osmux messages. * Returned pointer can be freed with regular talloc_free, all pending messages * in queue and all internal data will be freed. */ -static unsigned int next_default_name_idx = 0; struct osmux_in_handle *osmux_xfrm_input_alloc(void *ctx) { struct osmux_in_handle *h; @@ -735,7 +734,7 @@ return h; } -/* DEPRECATED: Use osmux_xfrm_input_alloc() instead */ +/*! \deprecated: Use osmux_xfrm_input_alloc() instead */ void osmux_xfrm_input_init(struct osmux_in_handle *h) { struct osmux_link *link; @@ -849,7 +848,7 @@ osmux_link_del_circuit(link, circuit); } -/* DEPRECATED: Use talloc_free() instead (will call osmux_xfrm_input_talloc_destructor()) */ +/*! \deprecated: Use talloc_free() instead (will call osmux_xfrm_input_talloc_destructor()) */ void osmux_xfrm_input_fini(struct osmux_in_handle *h) { (void)osmux_xfrm_input_talloc_destructor(h); diff --git a/src/osmux_output.c b/src/osmux_output.c index f48e1c9..664ed60 100644 --- a/src/osmux_output.c +++ b/src/osmux_output.c @@ -27,6 +27,12 @@ #include <arpa/inet.h> +/* delta time between two RTP messages (in microseconds) */ +#define DELTA_RTP_MSG 20000 +/* delta time between two RTP messages (in samples, 8kHz) */ +#define DELTA_RTP_TIMESTAMP 160 + + /*! \addtogroup osmux Osmocom Multiplex Protocol * @{ * @@ -43,12 +49,6 @@ /*! \file osmux_output.c * \brief Osmocom multiplex protocol helpers (output) */ - -/* delta time between two RTP messages (in microseconds) */ -#define DELTA_RTP_MSG 20000 -/* delta time between two RTP messages (in samples, 8kHz) */ -#define DELTA_RTP_TIMESTAMP 160 - static uint32_t osmux_ft_dummy_size(uint8_t amr_ft, uint8_t batch_factor) { return sizeof(struct osmux_hdr) + (osmo_amr_bytes(amr_ft) * batch_factor); @@ -330,14 +330,14 @@ return h; } -/* DEPRECATED: Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead */ +/*! \deprecated: Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead */ void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type) { memset(h, 0, sizeof(*h)); _osmux_xfrm_output_init(h, rtp_ssrc, rtp_payload_type); } -/* DEPRECATED: Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead */ +/*! \deprecated: Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead */ void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc) { /* backward compatibility with old users, where 98 was harcoded in osmux_rebuild_rtp() */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5af0133322ddd5345a13380f1c007474c0bea117 Gerrit-Change-Number: 36299 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[M] Change in libosmo-netif[master]: docs: various osmux API documentation updates

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36299?usp=email ) Change subject: docs: various osmux API documentation updates ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5af0133322ddd5345a13380f1c007474c0bea117 Gerrit-Change-Number: 36299 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Mar 2024 13:23:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in libosmo-netif[master]: docs: various osmux API documentation updates

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36299?usp=email ) Change subject: docs: various osmux API documentation updates ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5af0133322ddd5345a13380f1c007474c0bea117 Gerrit-Change-Number: 36299 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Mar 2024 13:23:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

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

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/mncc-python/+/36320?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )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, 37 insertions(+), 18 deletions(-) Approvals: laforge: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/mncc.h b/mncc.h index 394399f..5708f62 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> @@ -271,6 +271,7 @@ #define MNCC_F_CCCAP 0x0800 #define MNCC_F_KEYPAD 0x1000 #define MNCC_F_SIGNAL 0x2000 +#define MNCC_F_GCR 0x4000 struct gsm_mncc { /* context based information */ @@ -308,6 +309,9 @@ unsigned char lchan_type; unsigned char lchan_mode; + /* Global Call Reference (encoded as per 3GPP TS 29.205) */ + uint8_t gcr[16]; + char sdp[1024]; }; @@ -317,7 +321,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..7f5f422 100644 --- a/mncc.py +++ b/mncc.py @@ -188,7 +188,8 @@ MNCC_F_CCCAP = 0x0800 # macro MNCC_F_KEYPAD = 0x1000 # macro MNCC_F_SIGNAL = 0x2000 # macro -MNCC_SOCK_VERSION = 7 # macro +MNCC_F_GCR = 0x4000 # macro +MNCC_SOCK_VERSION = 8 # macro # values for enumeration 'gsm48_bcap_itcap' gsm48_bcap_itcap__enumvalues = { @@ -524,6 +525,7 @@ ('imsi', ctypes.c_char * 16), ('lchan_type', ctypes.c_ubyte), ('lchan_mode', ctypes.c_ubyte), + ('gcr', ctypes.c_ubyte * 16), ('sdp', ctypes.c_char * 1024), ('PADDING_0', ctypes.c_ubyte * 2), ] @@ -624,21 +626,22 @@ 'MNCC_FRAME_RECV', 'MNCC_F_BEARER_CAP', 'MNCC_F_CALLED', 'MNCC_F_CALLING', 'MNCC_F_CAUSE', 'MNCC_F_CCCAP', 'MNCC_F_CONNECTED', 'MNCC_F_EMERGENCY', 'MNCC_F_FACILITY', - 'MNCC_F_KEYPAD', 'MNCC_F_PROGRESS', 'MNCC_F_REDIRECTING', - 'MNCC_F_SIGNAL', 'MNCC_F_SSVERSION', 'MNCC_F_USERUSER', - 'MNCC_HOLD_CNF', 'MNCC_HOLD_IND', 'MNCC_HOLD_REJ', - 'MNCC_LCHAN_MODIFY', 'MNCC_MODIFY_CNF', 'MNCC_MODIFY_IND', - 'MNCC_MODIFY_REJ', 'MNCC_MODIFY_REQ', 'MNCC_MODIFY_RSP', - 'MNCC_NOTIFY_IND', 'MNCC_NOTIFY_REQ', 'MNCC_PROGRESS_REQ', - 'MNCC_REJ_IND', 'MNCC_REJ_REQ', 'MNCC_REL_CNF', 'MNCC_REL_IND', - 'MNCC_REL_REQ', 'MNCC_RETRIEVE_CNF', 'MNCC_RETRIEVE_IND', - 'MNCC_RETRIEVE_REJ', 'MNCC_RTP_CONNECT', 'MNCC_RTP_CREATE', - 'MNCC_RTP_FREE', 'MNCC_SETUP_CNF', 'MNCC_SETUP_COMPL_IND', - 'MNCC_SETUP_COMPL_REQ', 'MNCC_SETUP_IND', 'MNCC_SETUP_REQ', - 'MNCC_SETUP_RSP', 'MNCC_SOCKET_HELLO', 'MNCC_SOCK_VERSION', - 'MNCC_START_DTMF_IND', 'MNCC_START_DTMF_REJ', - 'MNCC_START_DTMF_RSP', 'MNCC_STOP_DTMF_IND', 'MNCC_STOP_DTMF_RSP', - 'MNCC_USERINFO_IND', 'MNCC_USERINFO_REQ', 'gsm48_bcap_coding', + 'MNCC_F_GCR', 'MNCC_F_KEYPAD', 'MNCC_F_PROGRESS', + 'MNCC_F_REDIRECTING', 'MNCC_F_SIGNAL', 'MNCC_F_SSVERSION', + 'MNCC_F_USERUSER', 'MNCC_HOLD_CNF', 'MNCC_HOLD_IND', + 'MNCC_HOLD_REJ', 'MNCC_LCHAN_MODIFY', 'MNCC_MODIFY_CNF', + 'MNCC_MODIFY_IND', 'MNCC_MODIFY_REJ', 'MNCC_MODIFY_REQ', + 'MNCC_MODIFY_RSP', 'MNCC_NOTIFY_IND', 'MNCC_NOTIFY_REQ', + 'MNCC_PROGRESS_REQ', 'MNCC_REJ_IND', 'MNCC_REJ_REQ', + 'MNCC_REL_CNF', 'MNCC_REL_IND', 'MNCC_REL_REQ', + 'MNCC_RETRIEVE_CNF', 'MNCC_RETRIEVE_IND', 'MNCC_RETRIEVE_REJ', + 'MNCC_RTP_CONNECT', 'MNCC_RTP_CREATE', 'MNCC_RTP_FREE', + 'MNCC_SETUP_CNF', 'MNCC_SETUP_COMPL_IND', 'MNCC_SETUP_COMPL_REQ', + 'MNCC_SETUP_IND', 'MNCC_SETUP_REQ', 'MNCC_SETUP_RSP', + 'MNCC_SOCKET_HELLO', 'MNCC_SOCK_VERSION', 'MNCC_START_DTMF_IND', + 'MNCC_START_DTMF_REJ', 'MNCC_START_DTMF_RSP', + 'MNCC_STOP_DTMF_IND', 'MNCC_STOP_DTMF_RSP', 'MNCC_USERINFO_IND', + 'MNCC_USERINFO_REQ', 'gsm48_bcap_coding', 'gsm48_bcap_interm_rate', 'gsm48_bcap_itcap', 'gsm48_bcap_modem_type', 'gsm48_bcap_parity', 'gsm48_bcap_ra', 'gsm48_bcap_rrq', 'gsm48_bcap_sig_access', -- 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: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

3 months, 1 week

1
0
0 0

[M] Change in mncc-python[master]: Update MNCC with LLC+HLC support

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/mncc-python/+/36321?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Update MNCC with LLC+HLC support ...................................................................... Update MNCC with LLC+HLC support ... as introduced in osmo-msc Change-Id I15f5afcf069ee6c1c4641108ceacc837bee311b5 Change-Id: Ic318656b778ed1ce115d8e60b0dce4ef75ed0a2c --- M mncc.h M mncc.py 2 files changed, 80 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, approved; Verified jolly: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/mncc.h b/mncc.h index 5708f62..3e3d89b 100644 --- a/mncc.h +++ b/mncc.h @@ -272,6 +272,14 @@ #define MNCC_F_KEYPAD 0x1000 #define MNCC_F_SIGNAL 0x2000 #define MNCC_F_GCR 0x4000 +#define MNCC_F_HIGHL_COMPAT 0x8000 +#define MNCC_F_LOWL_COMPAT 0x10000 + +/* UPDATEME when adding new MNCC_F_* entries above */ +#define MNCC_F_ALL 0x1ffff + +#define GSM_MAX_LOWL_COMPAT 16 /* (18 with TLV) */ +#define GSM_MAX_HIGHL_COMPAT 3 /* (5 with TLV) */ struct gsm_mncc { /* context based information */ @@ -313,6 +321,20 @@ uint8_t gcr[16]; char sdp[1024]; + + /* Additional information that extends current socket interface version. */ + + /* The content requals of Low Layer compatibility IE, described in 3GPP TS 24.008 §10.5.4.18. */ + struct gsm_mncc_lowl_compat { + uint8_t len; + uint8_t compat[GSM_MAX_LOWL_COMPAT]; + } llc; + + /* The content requals of High Layer compatibility IE, described in 3GPP TS 24.008 §10.5.4.16. */ + struct gsm_mncc_highl_compat { + uint8_t len; + uint8_t compat[GSM_MAX_HIGHL_COMPAT]; + } hlc; }; struct gsm_data_frame { diff --git a/mncc.py b/mncc.py index 7f5f422..94ace48 100644 --- a/mncc.py +++ b/mncc.py @@ -189,6 +189,11 @@ MNCC_F_KEYPAD = 0x1000 # macro MNCC_F_SIGNAL = 0x2000 # macro MNCC_F_GCR = 0x4000 # macro +MNCC_F_HIGHL_COMPAT = 0x8000 # macro +MNCC_F_LOWL_COMPAT = 0x10000 # macro +MNCC_F_ALL = 0x1ffff # macro +GSM_MAX_LOWL_COMPAT = 16 # macro +GSM_MAX_HIGHL_COMPAT = 3 # macro MNCC_SOCK_VERSION = 8 # macro # values for enumeration 'gsm48_bcap_itcap' @@ -491,6 +496,15 @@ class struct_gsm_mncc(Structure): pass +class struct_gsm_mncc_lowl_compat(Structure): + pass + +struct_gsm_mncc_lowl_compat._pack_ = 1 # source:False +struct_gsm_mncc_lowl_compat._fields_ = [ + ('len', ctypes.c_ubyte), + ('compat', ctypes.c_ubyte * 16), +] + class struct_gsm_mncc_clir(Structure): pass @@ -500,6 +514,15 @@ ('inv', ctypes.c_int32), ] +class struct_gsm_mncc_highl_compat(Structure): + pass + +struct_gsm_mncc_highl_compat._pack_ = 1 # source:False +struct_gsm_mncc_highl_compat._fields_ = [ + ('len', ctypes.c_ubyte), + ('compat', ctypes.c_ubyte * 3), +] + struct_gsm_mncc._pack_ = 1 # source:False struct_gsm_mncc._fields_ = [ ('msg_type', ctypes.c_uint32), @@ -527,7 +550,9 @@ ('lchan_mode', ctypes.c_ubyte), ('gcr', ctypes.c_ubyte * 16), ('sdp', ctypes.c_char * 1024), - ('PADDING_0', ctypes.c_ubyte * 2), + ('llc', struct_gsm_mncc_lowl_compat), + ('hlc', struct_gsm_mncc_highl_compat), + ('PADDING_0', ctypes.c_ubyte), ] class struct_gsm_data_frame(Structure): @@ -615,6 +640,7 @@ 'GSM48_BCAP_UR_12000', 'GSM48_BCAP_UR_1200_75', 'GSM48_BCAP_UR_2400', 'GSM48_BCAP_UR_300', 'GSM48_BCAP_UR_4800', 'GSM48_BCAP_UR_9600', 'GSM_BAD_FRAME', 'GSM_MAX_FACILITY', + 'GSM_MAX_HIGHL_COMPAT', 'GSM_MAX_LOWL_COMPAT', 'GSM_MAX_SSVERSION', 'GSM_MAX_USERUSER', 'GSM_MNCC_BCAP_AUDIO', 'GSM_MNCC_BCAP_FAX_G3', 'GSM_MNCC_BCAP_OTHER_ITC', 'GSM_MNCC_BCAP_RESERVED', 'GSM_MNCC_BCAP_SPEECH', @@ -623,25 +649,25 @@ 'MNCC_ALERT_REQ', 'MNCC_BRIDGE', 'MNCC_CALL_CONF_IND', 'MNCC_CALL_PROC_REQ', 'MNCC_DISC_IND', 'MNCC_DISC_REQ', 'MNCC_FACILITY_IND', 'MNCC_FACILITY_REQ', 'MNCC_FRAME_DROP', - 'MNCC_FRAME_RECV', 'MNCC_F_BEARER_CAP', 'MNCC_F_CALLED', - 'MNCC_F_CALLING', 'MNCC_F_CAUSE', 'MNCC_F_CCCAP', + 'MNCC_FRAME_RECV', 'MNCC_F_ALL', 'MNCC_F_BEARER_CAP', + 'MNCC_F_CALLED', 'MNCC_F_CALLING', 'MNCC_F_CAUSE', 'MNCC_F_CCCAP', 'MNCC_F_CONNECTED', 'MNCC_F_EMERGENCY', 'MNCC_F_FACILITY', - 'MNCC_F_GCR', 'MNCC_F_KEYPAD', 'MNCC_F_PROGRESS', - 'MNCC_F_REDIRECTING', 'MNCC_F_SIGNAL', 'MNCC_F_SSVERSION', - 'MNCC_F_USERUSER', 'MNCC_HOLD_CNF', 'MNCC_HOLD_IND', - 'MNCC_HOLD_REJ', 'MNCC_LCHAN_MODIFY', 'MNCC_MODIFY_CNF', - 'MNCC_MODIFY_IND', 'MNCC_MODIFY_REJ', 'MNCC_MODIFY_REQ', - 'MNCC_MODIFY_RSP', 'MNCC_NOTIFY_IND', 'MNCC_NOTIFY_REQ', - 'MNCC_PROGRESS_REQ', 'MNCC_REJ_IND', 'MNCC_REJ_REQ', - 'MNCC_REL_CNF', 'MNCC_REL_IND', 'MNCC_REL_REQ', - 'MNCC_RETRIEVE_CNF', 'MNCC_RETRIEVE_IND', 'MNCC_RETRIEVE_REJ', - 'MNCC_RTP_CONNECT', 'MNCC_RTP_CREATE', 'MNCC_RTP_FREE', - 'MNCC_SETUP_CNF', 'MNCC_SETUP_COMPL_IND', 'MNCC_SETUP_COMPL_REQ', - 'MNCC_SETUP_IND', 'MNCC_SETUP_REQ', 'MNCC_SETUP_RSP', - 'MNCC_SOCKET_HELLO', 'MNCC_SOCK_VERSION', 'MNCC_START_DTMF_IND', - 'MNCC_START_DTMF_REJ', 'MNCC_START_DTMF_RSP', - 'MNCC_STOP_DTMF_IND', 'MNCC_STOP_DTMF_RSP', 'MNCC_USERINFO_IND', - 'MNCC_USERINFO_REQ', 'gsm48_bcap_coding', + 'MNCC_F_GCR', 'MNCC_F_HIGHL_COMPAT', 'MNCC_F_KEYPAD', + 'MNCC_F_LOWL_COMPAT', 'MNCC_F_PROGRESS', 'MNCC_F_REDIRECTING', + 'MNCC_F_SIGNAL', 'MNCC_F_SSVERSION', 'MNCC_F_USERUSER', + 'MNCC_HOLD_CNF', 'MNCC_HOLD_IND', 'MNCC_HOLD_REJ', + 'MNCC_LCHAN_MODIFY', 'MNCC_MODIFY_CNF', 'MNCC_MODIFY_IND', + 'MNCC_MODIFY_REJ', 'MNCC_MODIFY_REQ', 'MNCC_MODIFY_RSP', + 'MNCC_NOTIFY_IND', 'MNCC_NOTIFY_REQ', 'MNCC_PROGRESS_REQ', + 'MNCC_REJ_IND', 'MNCC_REJ_REQ', 'MNCC_REL_CNF', 'MNCC_REL_IND', + 'MNCC_REL_REQ', 'MNCC_RETRIEVE_CNF', 'MNCC_RETRIEVE_IND', + 'MNCC_RETRIEVE_REJ', 'MNCC_RTP_CONNECT', 'MNCC_RTP_CREATE', + 'MNCC_RTP_FREE', 'MNCC_SETUP_CNF', 'MNCC_SETUP_COMPL_IND', + 'MNCC_SETUP_COMPL_REQ', 'MNCC_SETUP_IND', 'MNCC_SETUP_REQ', + 'MNCC_SETUP_RSP', 'MNCC_SOCKET_HELLO', 'MNCC_SOCK_VERSION', + 'MNCC_START_DTMF_IND', 'MNCC_START_DTMF_REJ', + 'MNCC_START_DTMF_RSP', 'MNCC_STOP_DTMF_IND', 'MNCC_STOP_DTMF_RSP', + 'MNCC_USERINFO_IND', 'MNCC_USERINFO_REQ', 'gsm48_bcap_coding', 'gsm48_bcap_interm_rate', 'gsm48_bcap_itcap', 'gsm48_bcap_modem_type', 'gsm48_bcap_parity', 'gsm48_bcap_ra', 'gsm48_bcap_rrq', 'gsm48_bcap_sig_access', @@ -651,7 +677,8 @@ 'struct_gsm_mncc_bearer_cap_data', 'struct_gsm_mncc_bridge', 'struct_gsm_mncc_cause', 'struct_gsm_mncc_cccap', 'struct_gsm_mncc_clir', 'struct_gsm_mncc_facility', - 'struct_gsm_mncc_hello', 'struct_gsm_mncc_number', + 'struct_gsm_mncc_hello', 'struct_gsm_mncc_highl_compat', + 'struct_gsm_mncc_lowl_compat', 'struct_gsm_mncc_number', 'struct_gsm_mncc_progress', 'struct_gsm_mncc_rtp', 'struct_gsm_mncc_ssversion', 'struct_gsm_mncc_useruser', 'struct_sockaddr_storage'] -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36321?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: Ic318656b778ed1ce115d8e60b0dce4ef75ed0a2c Gerrit-Change-Number: 36321 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

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

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/mncc-python/+/36319?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: port over ctypeslib2 ...................................................................... port over ctypeslib2 After many years without ctypeslib maintenance, there's finally a ctypeslib2 for python3.x Instead of the crude gcc2xml hack it uses libclang to generate python directly from the C. Change-Id: I9efd56623ebeabef4317356a05484a620a3a91cc --- M gsm_call_fsm.py M mncc.h M mncc.py M mncc_sock.py M regen-mncc-py.sh 5 files changed, 634 insertions(+), 1,726 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified fixeria: Looks good to me, but someone else must approve diff --git a/gsm_call_fsm.py b/gsm_call_fsm.py index 9e2b633..3657a1a 100644 --- a/gsm_call_fsm.py +++ b/gsm_call_fsm.py @@ -18,7 +18,7 @@ from fysom import Fysom from mncc_sock import mncc_msg, mncc_number, mncc_rtp_msg, mncc_bridge_msg, mncc_bearer_cap -Uint32Array2 = mncc.uint32_t * 2 +Uint32Array2 = ctypes.c_uint32 * 2 class GSM48: class BCAP_SV(object): diff --git a/mncc.h b/mncc.h index 230afbd..394399f 100644 --- a/mncc.h +++ b/mncc.h @@ -127,7 +127,7 @@ int radio; /* Radio Channel Requirement */ int speech_ctm; /* CTM text telephony indication */ int speech_ver[8]; /* Speech version indication */ - struct { + struct gsm_mncc_bearer_cap_data { enum gsm48_bcap_ra rate_adaption; enum gsm48_bcap_sig_access sig_access; int async; @@ -185,7 +185,7 @@ int pcp; }; -enum { +enum gsm_mncc_bcap { GSM_MNCC_BCAP_SPEECH = 0, GSM_MNCC_BCAP_UNR_DIG = 1, GSM_MNCC_BCAP_AUDIO = 2, @@ -292,7 +292,7 @@ struct gsm_mncc_facility facility; struct gsm_mncc_cccap cccap; struct gsm_mncc_ssversion ssversion; - struct { + struct gsm_mncc_clir { int sup; int inv; } clir; diff --git a/mncc.py b/mncc.py index 6a30eaa..e22fb74 100644 --- a/mncc.py +++ b/mncc.py @@ -1,1729 +1,654 @@ -from ctypes import * - -STRING = c_char_p +# -*- coding: utf-8 -*- +# +# TARGET arch is: [] +# WORD_SIZE is: 8 +# POINTER_SIZE is: 8 +# LONGDOUBLE_SIZE is: 16 +# +import ctypes -GSM48_BCAP_SV_AMR_OHW = 7 -SOCK_STREAM = 1 -GSM48_BCAP_UR_12000 = 6 -GSM_MNCC_BCAP_RESERVED = 7 -GSM_MNCC_BCAP_FAX_G3 = 3 -GSM48_BCAP_MT_V22bis = 3 -IPPORT_SUPDUP = 95 -IPPORT_TTYLINK = 87 -IPPORT_FINGER = 79 -IPPORT_RJE = 77 -IPPORT_TIMESERVER = 37 -GSM48_BCAP_SA_I440_I450 = 1 -IPPORT_EXECSERVER = 512 -IPPORT_LOGINSERVER = 513 -GSM48_BCAP_UR_2400 = 3 -IPPORT_EFSSERVER = 520 -IPPORT_DISCARD = 9 -GSM48_BCAP_IR_8k = 2 -IPPROTO_DCCP = 33 -MSG_WAITALL = 256 -GSM48_BCAP_ITCAP_UNR_DIG_INF = 1 -IPPORT_NAMESERVER = 42 -SOCK_DCCP = 6 -GSM_MNCC_BCAP_UNR_DIG = 1 -GSM48_BCAP_MT_V22 = 2 -IPPORT_DAYTIME = 13 -GSM48_BCAP_RRQ_DUAL_HR = 2 -GSM48_BCAP_RRQ_DUAL_FR = 3 -GSM48_BCAP_SV_AMR_OH = 11 -IPPROTO_MH = 135 -GSM48_BCAP_UR_300 = 1 -GSM48_BCAP_MT_V32 = 6 -IPPROTO_PIM = 103 -MSG_MORE = 32768 -IPPROTO_COMP = 108 -IPPROTO_ICMPV6 = 58 -GSM48_BCAP_MT_V21 = 1 -GSM48_BCAP_MT_V23 = 4 -SCM_RIGHTS = 1 -IPPORT_MTP = 57 -IPPROTO_BEETPH = 94 -MSG_DONTWAIT = 64 -IPPROTO_ROUTING = 43 -IPPORT_WHOIS = 43 -MSG_CONFIRM = 2048 -GSM48_BCAP_TMOD_CIRCUIT = 0 -IPPROTO_MTP = 92 -IPPORT_RESERVED = 1024 -GSM48_BCAP_RA_NONE = 0 -IPPORT_CMDSERVER = 514 -IPPROTO_MPLS = 137 -IPPORT_TELNET = 23 -GSM48_BCAP_MT_V26ter = 5 -MSG_WAITFORONE = 65536 -SHUT_RD = 0 -MSG_FIN = 512 -MSG_NOSIGNAL = 16384 -GSM48_BCAP_MT_AUTO_1 = 8 -IPPROTO_MAX = 263 -GSM48_BCAP_MT_UNDEF = 7 -IPPROTO_MPTCP = 262 -GSM48_BCAP_SV_AMR_FW = 8 -IPPORT_FTP = 21 -GSM48_BCAP_SV_HR = 1 -GSM48_BCAP_PAR_ONE = 5 -IPPROTO_ETHERNET = 143 -GSM48_BCAP_PAR_NONE = 3 -GSM48_BCAP_PAR_ODD = 0 -SOCK_NONBLOCK = 2048 -SOCK_CLOEXEC = 524288 -SOCK_PACKET = 10 -GSM48_BCAP_SV_EFR = 2 -GSM48_BCAP_MT_NONE = 0 -GSM48_BCAP_CODING_GSM_STD = 0 -MSG_BATCH = 262144 -SOCK_SEQPACKET = 5 -SOCK_RDM = 4 -SOCK_RAW = 3 -SOCK_DGRAM = 2 -MSG_ZEROCOPY = 67108864 -IPPORT_ECHO = 7 -IPPORT_BIFFUDP = 512 -GSM48_BCAP_ITCAP_FAX_G3 = 3 -IPPROTO_GRE = 47 -GSM48_BCAP_ITCAP_3k1_AUDIO = 2 -MSG_CTRUNC = 8 -MSG_FASTOPEN = 536870912 -GSM48_BCAP_SV_FR = 0 -IPPORT_WHOSERVER = 513 -IPPROTO_UDPLITE = 136 -GSM48_BCAP_RRQ_FR_ONLY = 1 -MSG_SYN = 1024 -IPPROTO_UDP = 17 -IPPROTO_RAW = 255 -GSM48_BCAP_ITCAP_SPEECH = 0 -GSM48_BCAP_SV_AMR_F = 4 -IPPORT_ROUTESERVER = 520 -GSM48_BCAP_SA_X21 = 2 -GSM48_BCAP_SA_X28_DP_UN = 4 -MSG_RST = 4096 -GSM48_BCAP_IR_16k = 3 -GSM48_BCAP_RA_X31 = 2 -MSG_PEEK = 2 -IPPORT_USERRESERVED = 5000 -MSG_TRYHARD = 4 -GSM48_BCAP_UR_1200_75 = 7 -MSG_CMSG_CLOEXEC = 1073741824 -GSM48_BCAP_SV_AMR_H = 5 -IPPROTO_ENCAP = 98 -IPPORT_SYSTAT = 11 -GSM48_BCAP_UR_9600 = 5 -GSM48_BCAP_RA_V110_X30 = 1 -GSM48_BCAP_UR_4800 = 4 -IPPORT_NETSTAT = 15 -GSM48_BCAP_PAR_ZERO = 4 -GSM48_BCAP_UR_1200 = 2 -IPPORT_SMTP = 25 -IPPROTO_IP = 0 -IPPROTO_EGP = 8 -IPPROTO_DSTOPTS = 60 -GSM_MNCC_BCAP_SPEECH = 0 -IPPROTO_NONE = 59 -IPPROTO_FRAGMENT = 44 -MSG_EOR = 128 -IPPROTO_HOPOPTS = 0 -GSM48_BCAP_PAR_EVEN = 2 -GSM_MNCC_BCAP_AUDIO = 2 -IPPROTO_IPV6 = 41 -GSM48_BCAP_SV_AMR_OFW = 6 -GSM48_BCAP_SA_X28_DP_IN = 3 -IPPROTO_AH = 51 -IPPROTO_ESP = 50 -IPPROTO_RSVP = 46 -MSG_TRUNC = 32 -MSG_PROXY = 16 -IPPROTO_PUP = 12 -MSG_DONTROUTE = 4 -GSM48_BCAP_TR_RLP_PREF = 3 -GSM48_BCAP_TR_RLP = 1 -IPPROTO_IPIP = 4 -MSG_OOB = 1 -GSM48_BCAP_SA_X32 = 6 -IPPROTO_IGMP = 2 -IPPROTO_ICMP = 1 -SHUT_RDWR = 2 -IPPROTO_SCTP = 132 -SHUT_WR = 1 -GSM48_BCAP_TR_TR_PREF = 2 -GSM48_BCAP_RA_OTHER = 3 -GSM48_BCAP_TMOD_PACKET = 1 -GSM48_BCAP_ITCAP_RESERVED = 7 -IPPROTO_TP = 29 -MSG_ERRQUEUE = 8192 -SCM_CREDENTIALS = 2 -GSM48_BCAP_SA_X28_NDP = 5 -GSM48_BCAP_TR_TRANSP = 0 -IPPROTO_IDP = 22 -GSM_MNCC_BCAP_OTHER_ITC = 5 -GSM48_BCAP_ITCAP_OTHER = 5 -IPPROTO_TCP = 6 -IPPORT_TFTP = 69 +class AsDictMixin: + @classmethod + def as_dict(cls, self): + result = {} + if not isinstance(self, AsDictMixin): + # not a structure, assume it's already a python object + return self + if not hasattr(cls, "_fields_"): + return result + # sys.version_info >= (3, 5) + # for (field, *_) in cls._fields_: # noqa + for field_tuple in cls._fields_: # noqa + field = field_tuple[0] + if field.startswith('PADDING_'): + continue + value = getattr(self, field) + type_ = type(value) + if hasattr(value, "_length_") and hasattr(value, "_type_"): + # array + if not hasattr(type_, "as_dict"): + value = [v for v in value] + else: + type_ = type_._type_ + value = [type_.as_dict(v) for v in value] + elif hasattr(value, "contents") and hasattr(value, "_type_"): + # pointer + try: + if not hasattr(type_, "as_dict"): + value = value.contents + else: + type_ = type_._type_ + value = type_.as_dict(value.contents) + except ValueError: + # nullptr + value = None + elif isinstance(value, AsDictMixin): + # other structure + value = type_.as_dict(value) + result[field] = value + return result + + +class Structure(ctypes.Structure, AsDictMixin): + + def __init__(self, *args, **kwds): + # We don't want to use positional arguments fill PADDING_* fields + + args = dict(zip(self.__class__._field_names_(), args)) + args.update(kwds) + super(Structure, self).__init__(**args) + + @classmethod + def _field_names_(cls): + if hasattr(cls, '_fields_'): + return (f[0] for f in cls._fields_ if not f[0].startswith('PADDING')) + else: + return () + + @classmethod + def get_type(cls, field): + for f in cls._fields_: + if f[0] == field: + return f[1] + return None + + @classmethod + def bind(cls, bound_fields): + fields = {} + for name, type_ in cls._fields_: + if hasattr(type_, "restype"): + if name in bound_fields: + if bound_fields[name] is None: + fields[name] = type_() + else: + # use a closure to capture the callback from the loop scope + fields[name] = ( + type_((lambda callback: lambda *args: callback(*args))( + bound_fields[name])) + ) + del bound_fields[name] + else: + # default callback implementation (does nothing) + try: + default_ = type_(0).restype().value + except TypeError: + default_ = None + fields[name] = type_(( + lambda default_: lambda *args: default_)(default_)) + else: + # not a callback function, use default initialization + if name in bound_fields: + fields[name] = bound_fields[name] + del bound_fields[name] + else: + fields[name] = type_() + if len(bound_fields) != 0: + raise ValueError( + "Cannot bind the following unknown callback(s) {}.{}".format( + cls.__name__, bound_fields.keys() + )) + return cls(**fields) + + +class Union(ctypes.Union, AsDictMixin): + pass + + + + + +GSM_MAX_FACILITY = 128 # macro +GSM_MAX_SSVERSION = 128 # macro +GSM_MAX_USERUSER = 128 # macro +MNCC_SETUP_REQ = 0x0101 # macro +MNCC_SETUP_IND = 0x0102 # macro +MNCC_SETUP_RSP = 0x0103 # macro +MNCC_SETUP_CNF = 0x0104 # macro +MNCC_SETUP_COMPL_REQ = 0x0105 # macro +MNCC_SETUP_COMPL_IND = 0x0106 # macro +MNCC_CALL_CONF_IND = 0x0107 # macro +MNCC_CALL_PROC_REQ = 0x0108 # macro +MNCC_PROGRESS_REQ = 0x0109 # macro +MNCC_ALERT_REQ = 0x010a # macro +MNCC_ALERT_IND = 0x010b # macro +MNCC_NOTIFY_REQ = 0x010c # macro +MNCC_NOTIFY_IND = 0x010d # macro +MNCC_DISC_REQ = 0x010e # macro +MNCC_DISC_IND = 0x010f # macro +MNCC_REL_REQ = 0x0110 # macro +MNCC_REL_IND = 0x0111 # macro +MNCC_REL_CNF = 0x0112 # macro +MNCC_FACILITY_REQ = 0x0113 # macro +MNCC_FACILITY_IND = 0x0114 # macro +MNCC_START_DTMF_IND = 0x0115 # macro +MNCC_START_DTMF_RSP = 0x0116 # macro +MNCC_START_DTMF_REJ = 0x0117 # macro +MNCC_STOP_DTMF_IND = 0x0118 # macro +MNCC_STOP_DTMF_RSP = 0x0119 # macro +MNCC_MODIFY_REQ = 0x011a # macro +MNCC_MODIFY_IND = 0x011b # macro +MNCC_MODIFY_RSP = 0x011c # macro +MNCC_MODIFY_CNF = 0x011d # macro +MNCC_MODIFY_REJ = 0x011e # macro +MNCC_HOLD_IND = 0x011f # macro +MNCC_HOLD_CNF = 0x0120 # macro +MNCC_HOLD_REJ = 0x0121 # macro +MNCC_RETRIEVE_IND = 0x0122 # macro +MNCC_RETRIEVE_CNF = 0x0123 # macro +MNCC_RETRIEVE_REJ = 0x0124 # macro +MNCC_USERINFO_REQ = 0x0125 # macro +MNCC_USERINFO_IND = 0x0126 # macro +MNCC_REJ_REQ = 0x0127 # macro +MNCC_REJ_IND = 0x0128 # macro +MNCC_BRIDGE = 0x0200 # macro +MNCC_FRAME_RECV = 0x0201 # macro +MNCC_FRAME_DROP = 0x0202 # macro +MNCC_LCHAN_MODIFY = 0x0203 # macro +MNCC_RTP_CREATE = 0x0204 # macro +MNCC_RTP_CONNECT = 0x0205 # macro +MNCC_RTP_FREE = 0x0206 # macro +GSM_TCHF_FRAME = 0x0300 # macro +GSM_TCHF_FRAME_EFR = 0x0301 # macro +GSM_TCHH_FRAME = 0x0302 # macro +GSM_TCH_FRAME_AMR = 0x0303 # macro +GSM_BAD_FRAME = 0x03ff # macro +MNCC_SOCKET_HELLO = 0x0400 # macro +MNCC_F_BEARER_CAP = 0x0001 # macro +MNCC_F_CALLED = 0x0002 # macro +MNCC_F_CALLING = 0x0004 # macro +MNCC_F_REDIRECTING = 0x0008 # macro +MNCC_F_CONNECTED = 0x0010 # macro +MNCC_F_CAUSE = 0x0020 # macro +MNCC_F_USERUSER = 0x0040 # macro +MNCC_F_PROGRESS = 0x0080 # macro +MNCC_F_EMERGENCY = 0x0100 # macro +MNCC_F_FACILITY = 0x0200 # macro +MNCC_F_SSVERSION = 0x0400 # macro +MNCC_F_CCCAP = 0x0800 # macro +MNCC_F_KEYPAD = 0x1000 # macro +MNCC_F_SIGNAL = 0x2000 # macro +MNCC_SOCK_VERSION = 7 # macro # values for enumeration 'gsm48_bcap_itcap' -gsm48_bcap_itcap = c_int # enum +gsm48_bcap_itcap__enumvalues = { + 0: 'GSM48_BCAP_ITCAP_SPEECH', + 1: 'GSM48_BCAP_ITCAP_UNR_DIG_INF', + 2: 'GSM48_BCAP_ITCAP_3k1_AUDIO', + 3: 'GSM48_BCAP_ITCAP_FAX_G3', + 5: 'GSM48_BCAP_ITCAP_OTHER', + 7: 'GSM48_BCAP_ITCAP_RESERVED', +} +GSM48_BCAP_ITCAP_SPEECH = 0 +GSM48_BCAP_ITCAP_UNR_DIG_INF = 1 +GSM48_BCAP_ITCAP_3k1_AUDIO = 2 +GSM48_BCAP_ITCAP_FAX_G3 = 3 +GSM48_BCAP_ITCAP_OTHER = 5 +GSM48_BCAP_ITCAP_RESERVED = 7 +gsm48_bcap_itcap = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_tmod' -gsm48_bcap_tmod = c_int # enum +gsm48_bcap_tmod__enumvalues = { + 0: 'GSM48_BCAP_TMOD_CIRCUIT', + 1: 'GSM48_BCAP_TMOD_PACKET', +} +GSM48_BCAP_TMOD_CIRCUIT = 0 +GSM48_BCAP_TMOD_PACKET = 1 +gsm48_bcap_tmod = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_coding' -gsm48_bcap_coding = c_int # enum +gsm48_bcap_coding__enumvalues = { + 0: 'GSM48_BCAP_CODING_GSM_STD', +} +GSM48_BCAP_CODING_GSM_STD = 0 +gsm48_bcap_coding = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_rrq' -gsm48_bcap_rrq = c_int # enum +gsm48_bcap_rrq__enumvalues = { + 1: 'GSM48_BCAP_RRQ_FR_ONLY', + 2: 'GSM48_BCAP_RRQ_DUAL_HR', + 3: 'GSM48_BCAP_RRQ_DUAL_FR', +} +GSM48_BCAP_RRQ_FR_ONLY = 1 +GSM48_BCAP_RRQ_DUAL_HR = 2 +GSM48_BCAP_RRQ_DUAL_FR = 3 +gsm48_bcap_rrq = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_ra' -gsm48_bcap_ra = c_int # enum +gsm48_bcap_ra__enumvalues = { + 0: 'GSM48_BCAP_RA_NONE', + 1: 'GSM48_BCAP_RA_V110_X30', + 2: 'GSM48_BCAP_RA_X31', + 3: 'GSM48_BCAP_RA_OTHER', +} +GSM48_BCAP_RA_NONE = 0 +GSM48_BCAP_RA_V110_X30 = 1 +GSM48_BCAP_RA_X31 = 2 +GSM48_BCAP_RA_OTHER = 3 +gsm48_bcap_ra = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_sig_access' -gsm48_bcap_sig_access = c_int # enum +gsm48_bcap_sig_access__enumvalues = { + 1: 'GSM48_BCAP_SA_I440_I450', + 2: 'GSM48_BCAP_SA_X21', + 3: 'GSM48_BCAP_SA_X28_DP_IN', + 4: 'GSM48_BCAP_SA_X28_DP_UN', + 5: 'GSM48_BCAP_SA_X28_NDP', + 6: 'GSM48_BCAP_SA_X32', +} +GSM48_BCAP_SA_I440_I450 = 1 +GSM48_BCAP_SA_X21 = 2 +GSM48_BCAP_SA_X28_DP_IN = 3 +GSM48_BCAP_SA_X28_DP_UN = 4 +GSM48_BCAP_SA_X28_NDP = 5 +GSM48_BCAP_SA_X32 = 6 +gsm48_bcap_sig_access = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_user_rate' -gsm48_bcap_user_rate = c_int # enum +gsm48_bcap_user_rate__enumvalues = { + 1: 'GSM48_BCAP_UR_300', + 2: 'GSM48_BCAP_UR_1200', + 3: 'GSM48_BCAP_UR_2400', + 4: 'GSM48_BCAP_UR_4800', + 5: 'GSM48_BCAP_UR_9600', + 6: 'GSM48_BCAP_UR_12000', + 7: 'GSM48_BCAP_UR_1200_75', +} +GSM48_BCAP_UR_300 = 1 +GSM48_BCAP_UR_1200 = 2 +GSM48_BCAP_UR_2400 = 3 +GSM48_BCAP_UR_4800 = 4 +GSM48_BCAP_UR_9600 = 5 +GSM48_BCAP_UR_12000 = 6 +GSM48_BCAP_UR_1200_75 = 7 +gsm48_bcap_user_rate = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_parity' -gsm48_bcap_parity = c_int # enum +gsm48_bcap_parity__enumvalues = { + 0: 'GSM48_BCAP_PAR_ODD', + 2: 'GSM48_BCAP_PAR_EVEN', + 3: 'GSM48_BCAP_PAR_NONE', + 4: 'GSM48_BCAP_PAR_ZERO', + 5: 'GSM48_BCAP_PAR_ONE', +} +GSM48_BCAP_PAR_ODD = 0 +GSM48_BCAP_PAR_EVEN = 2 +GSM48_BCAP_PAR_NONE = 3 +GSM48_BCAP_PAR_ZERO = 4 +GSM48_BCAP_PAR_ONE = 5 +gsm48_bcap_parity = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_interm_rate' -gsm48_bcap_interm_rate = c_int # enum +gsm48_bcap_interm_rate__enumvalues = { + 2: 'GSM48_BCAP_IR_8k', + 3: 'GSM48_BCAP_IR_16k', +} +GSM48_BCAP_IR_8k = 2 +GSM48_BCAP_IR_16k = 3 +gsm48_bcap_interm_rate = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_transp' -gsm48_bcap_transp = c_int # enum +gsm48_bcap_transp__enumvalues = { + 0: 'GSM48_BCAP_TR_TRANSP', + 1: 'GSM48_BCAP_TR_RLP', + 2: 'GSM48_BCAP_TR_TR_PREF', + 3: 'GSM48_BCAP_TR_RLP_PREF', +} +GSM48_BCAP_TR_TRANSP = 0 +GSM48_BCAP_TR_RLP = 1 +GSM48_BCAP_TR_TR_PREF = 2 +GSM48_BCAP_TR_RLP_PREF = 3 +gsm48_bcap_transp = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_modem_type' -gsm48_bcap_modem_type = c_int # enum +gsm48_bcap_modem_type__enumvalues = { + 0: 'GSM48_BCAP_MT_NONE', + 1: 'GSM48_BCAP_MT_V21', + 2: 'GSM48_BCAP_MT_V22', + 3: 'GSM48_BCAP_MT_V22bis', + 4: 'GSM48_BCAP_MT_V23', + 5: 'GSM48_BCAP_MT_V26ter', + 6: 'GSM48_BCAP_MT_V32', + 7: 'GSM48_BCAP_MT_UNDEF', + 8: 'GSM48_BCAP_MT_AUTO_1', +} +GSM48_BCAP_MT_NONE = 0 +GSM48_BCAP_MT_V21 = 1 +GSM48_BCAP_MT_V22 = 2 +GSM48_BCAP_MT_V22bis = 3 +GSM48_BCAP_MT_V23 = 4 +GSM48_BCAP_MT_V26ter = 5 +GSM48_BCAP_MT_V32 = 6 +GSM48_BCAP_MT_UNDEF = 7 +GSM48_BCAP_MT_AUTO_1 = 8 +gsm48_bcap_modem_type = ctypes.c_uint32 # enum # values for enumeration 'gsm48_bcap_speech_ver' -gsm48_bcap_speech_ver = c_int # enum -class gsm_mncc_bearer_cap(Structure): +gsm48_bcap_speech_ver__enumvalues = { + 0: 'GSM48_BCAP_SV_FR', + 1: 'GSM48_BCAP_SV_HR', + 2: 'GSM48_BCAP_SV_EFR', + 4: 'GSM48_BCAP_SV_AMR_F', + 5: 'GSM48_BCAP_SV_AMR_H', + 6: 'GSM48_BCAP_SV_AMR_OFW', + 7: 'GSM48_BCAP_SV_AMR_OHW', + 8: 'GSM48_BCAP_SV_AMR_FW', + 11: 'GSM48_BCAP_SV_AMR_OH', +} +GSM48_BCAP_SV_FR = 0 +GSM48_BCAP_SV_HR = 1 +GSM48_BCAP_SV_EFR = 2 +GSM48_BCAP_SV_AMR_F = 4 +GSM48_BCAP_SV_AMR_H = 5 +GSM48_BCAP_SV_AMR_OFW = 6 +GSM48_BCAP_SV_AMR_OHW = 7 +GSM48_BCAP_SV_AMR_FW = 8 +GSM48_BCAP_SV_AMR_OH = 11 +gsm48_bcap_speech_ver = ctypes.c_uint32 # enum +class struct_gsm_mncc_bearer_cap(Structure): pass -class N19gsm_mncc_bearer_cap4DOT_25E(Structure): + +class struct_gsm_mncc_bearer_cap_data(Structure): pass -N19gsm_mncc_bearer_cap4DOT_25E._fields_ = [ + +struct_gsm_mncc_bearer_cap_data._pack_ = 1 # source:False +struct_gsm_mncc_bearer_cap_data._fields_ = [ ('rate_adaption', gsm48_bcap_ra), ('sig_access', gsm48_bcap_sig_access), - ('async', c_int), - ('nr_stop_bits', c_int), - ('nr_data_bits', c_int), + ('async', ctypes.c_int32), + ('nr_stop_bits', ctypes.c_int32), + ('nr_data_bits', ctypes.c_int32), ('user_rate', gsm48_bcap_user_rate), ('parity', gsm48_bcap_parity), ('interm_rate', gsm48_bcap_interm_rate), ('transp', gsm48_bcap_transp), ('modem_type', gsm48_bcap_modem_type), ] -gsm_mncc_bearer_cap._fields_ = [ - ('transfer', c_int), - ('mode', c_int), - ('coding', c_int), - ('radio', c_int), - ('speech_ctm', c_int), - ('speech_ver', c_int * 8), - ('data', N19gsm_mncc_bearer_cap4DOT_25E), -] -class gsm_mncc_number(Structure): - pass -gsm_mncc_number._fields_ = [ - ('type', c_int), - ('plan', c_int), - ('present', c_int), - ('screen', c_int), - ('number', c_char * 33), -] -class gsm_mncc_cause(Structure): - pass -gsm_mncc_cause._fields_ = [ - ('location', c_int), - ('coding', c_int), - ('rec', c_int), - ('rec_val', c_int), - ('value', c_int), - ('diag_len', c_int), - ('diag', c_char * 32), -] -class gsm_mncc_useruser(Structure): - pass -gsm_mncc_useruser._fields_ = [ - ('proto', c_int), - ('info', c_char * 129), -] -class gsm_mncc_progress(Structure): - pass -gsm_mncc_progress._fields_ = [ - ('coding', c_int), - ('location', c_int), - ('descr', c_int), -] -class gsm_mncc_facility(Structure): - pass -gsm_mncc_facility._fields_ = [ - ('len', c_int), - ('info', c_char * 128), -] -class gsm_mncc_ssversion(Structure): - pass -gsm_mncc_ssversion._fields_ = [ - ('len', c_int), - ('info', c_char * 128), -] -class gsm_mncc_cccap(Structure): - pass -gsm_mncc_cccap._fields_ = [ - ('dtmf', c_int), - ('pcp', c_int), + +struct_gsm_mncc_bearer_cap._pack_ = 1 # source:False +struct_gsm_mncc_bearer_cap._fields_ = [ + ('transfer', ctypes.c_int32), + ('mode', ctypes.c_int32), + ('coding', ctypes.c_int32), + ('radio', ctypes.c_int32), + ('speech_ctm', ctypes.c_int32), + ('speech_ver', ctypes.c_int32 * 8), + ('data', struct_gsm_mncc_bearer_cap_data), ] -# values for unnamed enumeration -class gsm_mncc(Structure): +class struct_gsm_mncc_number(Structure): pass -__uint32_t = c_uint -uint32_t = __uint32_t -class N8gsm_mncc4DOT_27E(Structure): - pass -N8gsm_mncc4DOT_27E._fields_ = [ - ('sup', c_int), - ('inv', c_int), -] -gsm_mncc._fields_ = [ - ('msg_type', uint32_t), - ('callref', uint32_t), - ('fields', uint32_t), - ('bearer_cap', gsm_mncc_bearer_cap), - ('called', gsm_mncc_number), - ('calling', gsm_mncc_number), - ('redirecting', gsm_mncc_number), - ('connected', gsm_mncc_number), - ('cause', gsm_mncc_cause), - ('progress', gsm_mncc_progress), - ('useruser', gsm_mncc_useruser), - ('facility', gsm_mncc_facility), - ('cccap', gsm_mncc_cccap), - ('ssversion', gsm_mncc_ssversion), - ('clir', N8gsm_mncc4DOT_27E), - ('signal', c_int), - ('keypad', c_int), - ('more', c_int), - ('notify', c_int), - ('emergency', c_int), - ('imsi', c_char * 16), - ('lchan_type', c_ubyte), - ('lchan_mode', c_ubyte), - ('sdp', c_char * 1024), -] -class gsm_data_frame(Structure): - pass -gsm_data_frame._fields_ = [ - ('msg_type', uint32_t), - ('callref', uint32_t), - ('data', c_ubyte * 0), -] -class gsm_mncc_hello(Structure): - pass -gsm_mncc_hello._fields_ = [ - ('msg_type', uint32_t), - ('version', uint32_t), - ('mncc_size', uint32_t), - ('data_frame_size', uint32_t), - ('called_offset', uint32_t), - ('signal_offset', uint32_t), - ('emergency_offset', uint32_t), - ('lchan_type_offset', uint32_t), -] -class gsm_mncc_rtp(Structure): - pass -class sockaddr_storage(Structure): - pass -sa_family_t = c_ushort -sockaddr_storage._fields_ = [ - ('ss_family', sa_family_t), - ('__ss_padding', c_char * 118), - ('__ss_align', c_ulong), -] -gsm_mncc_rtp._fields_ = [ - ('msg_type', uint32_t), - ('callref', uint32_t), - ('addr', sockaddr_storage), - ('payload_type', uint32_t), - ('payload_msg_type', uint32_t), - ('sdp', c_char * 1024), -] -class gsm_mncc_bridge(Structure): - pass -gsm_mncc_bridge._fields_ = [ - ('msg_type', uint32_t), - ('callref', uint32_t * 2), -] -SOL_PPPOL2TP = 273 # Variable c_int '273' -MNCC_SETUP_CNF = 260 # Variable c_int '260' -INT_FAST64_WIDTH = 64 # Variable c_int '64' -SO_RCVBUF = 8 # Variable c_int '8' -MNCC_REL_CNF = 274 # Variable c_int '274' -IPV6_FREEBIND = 78 # Variable c_int '78' -_ATFILE_SOURCE = 1 # Variable c_int '1' -IP_RECVFRAGSIZE = 25 # Variable c_int '25' -MNCC_RTP_CREATE = 516 # Variable c_int '516' -SO_PASSCRED = 16 # Variable c_int '16' -PF_SECURITY = 14 # Variable c_int '14' -SOL_XDP = 283 # Variable c_int '283' -INT_FAST16_MAX = 9223372036854775807 # Variable c_long '9223372036854775807l' -IP_PASSSEC = 18 # Variable c_int '18' -MNCC_FACILITY_IND = 276 # Variable c_int '276' -IPV6_DSTOPTS = 59 # Variable c_int '59' -IPV6_ORIGDSTADDR = 74 # Variable c_int '74' -__SIZEOF_PTHREAD_CONDATTR_T = 4 # Variable c_int '4' -SOL_AAL = 265 # Variable c_int '265' -SO_TIMESTAMPING_NEW = 65 # Variable c_int '65' -_BITS_PTHREADTYPES_COMMON_H = 1 # Variable c_int '1' -INT_FAST16_MIN = -9223372036854775808 # Variable c_long '-0x08000000000000000l' -SOL_ALG = 279 # Variable c_int '279' -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 = 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' -__SIZEOF_PTHREAD_MUTEXATTR_T = 4 # Variable c_int '4' -IPV6_RECVFRAGSIZE = 77 # Variable c_int '77' -_POSIX_SOURCE = 1 # Variable c_int '1' -PF_ISDN = 34 # Variable c_int '34' -INT_LEAST8_MIN = -128 # Variable c_int '-0x00000000000000080' -MNCC_REL_IND = 273 # Variable c_int '273' -INT_FAST64_MIN = -9223372036854775808 # Variable c_long '-0x08000000000000000l' -INT16_WIDTH = 16 # Variable c_int '16' -SOL_CAIF = 278 # Variable c_int '278' -SO_MARK = 36 # Variable c_int '36' -IPV6_HOPLIMIT = 52 # Variable c_int '52' -__USE_POSIX199309 = 1 # Variable c_int '1' -MNCC_RTP_CONNECT = 517 # Variable c_int '517' -INT_LEAST16_WIDTH = 16 # Variable c_int '16' -SO_BINDTODEVICE = 25 # Variable c_int '25' -SOL_IUCV = 277 # Variable c_int '277' -SO_BROADCAST = 6 # Variable c_int '6' -__GLIBC_USE_DEPRECATED_SCANF = 0 # Variable c_int '0' -IP_ADD_SOURCE_MEMBERSHIP = 39 # Variable c_int '39' -__USE_ISOCXX11 = 1 # Variable c_int '1' -INT_FAST8_WIDTH = 8 # Variable c_int '8' -MNCC_F_USERUSER = 64 # Variable c_int '64' -IP_MULTICAST_ALL = 49 # Variable c_int '49' -PF_ALG = 38 # Variable c_int '38' -__SIZEOF_PTHREAD_BARRIER_T = 32 # Variable c_int '32' -INTMAX_WIDTH = 64 # Variable c_int '64' -SOL_RDS = 276 # Variable c_int '276' -IP_PMTUDISC_INTERFACE = 4 # Variable c_int '4' -IPV6_2292RTHDR = 5 # Variable c_int '5' -MCAST_JOIN_SOURCE_GROUP = 46 # Variable c_int '46' -IPV6_RTHDR = 57 # Variable c_int '57' -_BITS_ENDIANNESS_H = 1 # Variable c_int '1' -IPV6_PMTUDISC_DO = 2 # Variable c_int '2' -IP_MTU = 14 # Variable c_int '14' -INT8_MAX = 127 # Variable c_int '127' -__osockaddr_defined = 1 # Variable c_int '1' -__USE_KERNEL_IPV6_DEFS = 0 # Variable c_int '0' -SO_INCOMING_NAPI_ID = 56 # Variable c_int '56' -__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 = 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 = 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' -PTRDIFF_MAX = 9223372036854775807 # Variable c_long '9223372036854775807l' -MNCC_F_CCCAP = 2048 # Variable c_int '2048' -INT32_MIN = -2147483648 # Variable c_int '-0x00000000080000000' -__USE_XOPEN_EXTENDED = 1 # Variable c_int '1' -INT_LEAST32_MAX = 2147483647 # Variable c_int '2147483647' -IP_PKTINFO = 8 # Variable c_int '8' -UINT32_WIDTH = 32 # Variable c_int '32' -PF_BLUETOOTH = 31 # Variable c_int '31' -PF_IRDA = 23 # Variable c_int '23' -SO_DONTROUTE = 5 # Variable c_int '5' -PF_IUCV = 32 # Variable c_int '32' -MNCC_REJ_IND = 296 # Variable c_int '296' -PF_APPLETALK = 5 # Variable c_int '5' -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 = 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' -SOL_RXRPC = 272 # Variable c_int '272' -INT_FAST8_MIN = -128 # Variable c_int '-0x00000000000000080' -_XOPEN_SOURCE = 700 # Variable c_int '700' -SO_KEEPALIVE = 9 # Variable c_int '9' -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' -IN_CLASSC_NSHIFT = 8 # Variable c_int '8' -IP_PMTUDISC_DO = 2 # Variable c_int '2' -__GLIBC__ = 2 # Variable c_int '2' -SO_LOCK_FILTER = 44 # Variable c_int '44' -__USE_ISOC99 = 1 # Variable c_int '1' -SO_OOBINLINE = 10 # Variable c_int '10' -PF_AX25 = 3 # Variable c_int '3' -MNCC_F_SSVERSION = 1024 # Variable c_int '1024' -IPV6_MULTICAST_LOOP = 19 # Variable c_int '19' -SOL_TLS = 282 # Variable c_int '282' -IPV6_HOPOPTS = 54 # Variable c_int '54' -SOL_LLC = 268 # Variable c_int '268' -IPV6_RECVERR = 25 # Variable c_int '25' -INT_LEAST8_MAX = 127 # Variable c_int '127' -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 = 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' -INT8_WIDTH = 8 # Variable c_int '8' -MNCC_PROGRESS_REQ = 265 # Variable c_int '265' -PF_SMC = 43 # Variable c_int '43' -__USE_POSIX2 = 1 # Variable c_int '1' -INT_LEAST64_WIDTH = 64 # Variable c_int '64' -__iovec_defined = 1 # Variable c_int '1' -IPV6_RECVRTHDR = 56 # Variable c_int '56' -SOL_IRDA = 266 # Variable c_int '266' -MNCC_LCHAN_MODIFY = 515 # Variable c_int '515' -MNCC_F_REDIRECTING = 8 # Variable c_int '8' -GSM_MAX_FACILITY = 128 # Variable c_int '128' -INT64_WIDTH = 64 # Variable c_int '64' -IP_PMTUDISC = 10 # Variable c_int '10' -IPV6_2292PKTINFO = 2 # Variable c_int '2' -SO_TIMESTAMPNS_NEW = 64 # Variable c_int '64' -SO_PRIORITY = 12 # Variable c_int '12' -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' -__USE_ATFILE = 1 # Variable c_int '1' -PF_CAIF = 37 # Variable c_int '37' -IP_MAX_MEMBERSHIPS = 20 # Variable c_int '20' -INTMAX_MIN = -9223372036854775808 # Variable c_long '-0x08000000000000000l' -IP_RECVOPTS = 6 # Variable c_int '6' -UINT_LEAST8_WIDTH = 8 # Variable c_int '8' -UINT_FAST8_MAX = 255 # Variable c_int '255' -__USE_POSIX = 1 # Variable c_int '1' -IP_RECVTOS = 13 # Variable c_int '13' -IP_PMTUDISC_WANT = 1 # Variable c_int '1' -MCAST_LEAVE_SOURCE_GROUP = 47 # Variable c_int '47' -SO_PEERNAME = 28 # Variable c_int '28' -__BITS_PER_LONG = 64 # Variable c_int '64' -_BITS_STDINT_INTN_H = 1 # Variable c_int '1' -INT_FAST64_MAX = 9223372036854775807 # Variable c_long '9223372036854775807l' -IPV6_RECVPKTINFO = 49 # Variable c_int '49' -MNCC_BRIDGE = 512 # Variable c_int '512' -IPV6_PMTUDISC_WANT = 1 # Variable c_int '1' -MNCC_F_CALLED = 2 # Variable c_int '2' -IPV6_RTHDR_STRICT = 1 # Variable c_int '1' -IPV6_RECVHOPOPTS = 53 # Variable c_int '53' -SO_TYPE = 3 # Variable c_int '3' -_BITS_WCHAR_H = 1 # Variable c_int '1' -__GLIBC_MINOR__ = 32 # Variable c_int '32' -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 = 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' -IPV6_AUTOFLOWLABEL = 70 # Variable c_int '70' -GSM_MAX_USERUSER = 128 # Variable c_int '128' -__SIZEOF_PTHREAD_ATTR_T = 56 # Variable c_int '56' -IPV6_MINHOPCOUNT = 73 # Variable c_int '73' -IP_OPTIONS = 4 # Variable c_int '4' -SO_RCVLOWAT = 18 # Variable c_int '18' -SO_DEBUG = 1 # Variable c_int '1' -__WORDSIZE_TIME64_COMPAT32 = 1 # Variable c_int '1' -SCM_TIMESTAMPING_PKTINFO = 58 # Variable c_int '58' -IN_CLASSB_NSHIFT = 16 # Variable c_int '16' -_SYS_TYPES_H = 1 # Variable c_int '1' -SO_MEMINFO = 55 # Variable c_int '55' -PF_NETBEUI = 13 # Variable c_int '13' -__HAVE_GENERIC_SELECTION = 0 # Variable c_int '0' -IP_TOS = 1 # Variable c_int '1' -MNCC_USERINFO_REQ = 293 # Variable c_int '293' -IP_BIND_ADDRESS_NO_PORT = 24 # Variable c_int '24' -__USE_GNU = 1 # Variable c_int '1' -__GLIBC_USE_IEC_60559_FUNCS_EXT_C2X = 1 # Variable c_int '1' -PF_UNSPEC = 0 # Variable c_int '0' -__USE_LARGEFILE64 = 1 # Variable c_int '1' -IP_MTU_DISCOVER = 10 # Variable c_int '10' -SIOCGSTAMP_OLD = 35078 # Variable c_int '35078' -MNCC_MODIFY_IND = 283 # Variable c_int '283' -SOL_IPV6 = 41 # Variable c_int '41' -MNCC_CALL_CONF_IND = 263 # Variable c_int '263' -_POSIX_C_SOURCE = 200809 # Variable c_long '200809l' -MNCC_F_SIGNAL = 8192 # Variable c_int '8192' -UINT_LEAST16_WIDTH = 16 # Variable c_int '16' -SO_SNDTIMEO_OLD = 21 # Variable c_int '21' -IPV6_2292PKTOPTIONS = 6 # Variable c_int '6' -UINT_LEAST64_WIDTH = 64 # Variable c_int '64' -MNCC_DISC_IND = 271 # Variable c_int '271' -_DEFAULT_SOURCE = 1 # Variable c_int '1' -_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 = 18446744073709551615 # Variable c_ulong '-1ul' -IP_BLOCK_SOURCE = 38 # Variable c_int '38' -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' -SOL_PNPIPE = 275 # Variable c_int '275' -IP_TTL = 2 # Variable c_int '2' -_SYS_SOCKET_H = 1 # Variable c_int '1' -PF_TIPC = 30 # Variable c_int '30' -MNCC_MODIFY_CNF = 285 # Variable c_int '285' -INT32_MAX = 2147483647 # Variable c_int '2147483647' -INT_LEAST64_MIN = -9223372036854775808 # Variable c_long '-0x08000000000000000l' -__USE_LARGEFILE = 1 # Variable c_int '1' -__SIZEOF_PTHREAD_COND_T = 48 # Variable c_int '48' -PTRDIFF_MIN = -9223372036854775808 # Variable c_long '-0x08000000000000000l' -_FEATURES_H = 1 # Variable c_int '1' -IPV6_MTU_DISCOVER = 23 # Variable c_int '23' -SIG_ATOMIC_WIDTH = 32 # Variable c_int '32' -IP_ROUTER_ALERT = 5 # Variable c_int '5' -MNCC_MODIFY_REQ = 282 # Variable c_int '282' -_BITS_TYPES_H = 1 # Variable c_int '1' -IP_DEFAULT_MULTICAST_LOOP = 1 # Variable c_int '1' -IPV6_NEXTHOP = 9 # Variable c_int '9' -IP_MSFILTER = 41 # Variable c_int '41' -PF_DECnet = 12 # Variable c_int '12' -INT_LEAST8_WIDTH = 8 # Variable c_int '8' -IP_MINTTL = 21 # Variable c_int '21' -MNCC_MODIFY_REJ = 286 # Variable c_int '286' -PF_QIPCRTR = 42 # Variable c_int '42' -IP_PMTUDISC_DONT = 0 # Variable c_int '0' -UINT_LEAST32_WIDTH = 32 # Variable c_int '32' -_XOPEN_SOURCE_EXTENDED = 1 # Variable c_int '1' -SIOCGSTAMPNS_OLD = 35079 # Variable c_int '35079' -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 = 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' -UINT64_WIDTH = 64 # Variable c_int '64' -SO_BINDTOIFINDEX = 62 # Variable c_int '62' -SOL_SOCKET = 1 # Variable c_int '1' -INTPTR_MAX = 9223372036854775807 # Variable c_long '9223372036854775807l' -__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 = 1 # Variable c_int '1' -IPV6_2292DSTOPTS = 4 # Variable c_int '4' -MNCC_F_CALLING = 4 # Variable c_int '4' -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 = 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' -GSM_BAD_FRAME = 1023 # Variable c_int '1023' -__GLIBC_USE_DEPRECATED_GETS = 0 # Variable c_int '0' -PF_NETROM = 6 # Variable c_int '6' -__glibc_c99_flexarr_available = 1 # Variable c_int '1' -GSM_TCHH_FRAME = 770 # Variable c_int '770' -__GNU_LIBRARY__ = 6 # Variable c_int '6' -_BITS_TYPESIZES_H = 1 # Variable c_int '1' -IP_RECVTTL = 12 # Variable c_int '12' -MNCC_REL_REQ = 272 # Variable c_int '272' -MNCC_STOP_DTMF_RSP = 281 # Variable c_int '281' -SO_ERROR = 4 # Variable c_int '4' -MCAST_LEAVE_GROUP = 45 # Variable c_int '45' -IPV6_RECVHOPLIMIT = 51 # Variable c_int '51' -IP_ORIGDSTADDR = 20 # Variable c_int '20' -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 = 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' -MNCC_SETUP_COMPL_IND = 262 # Variable c_int '262' -SO_TIMESTAMPNS_OLD = 35 # Variable c_int '35' -INTMAX_MAX = 9223372036854775807 # Variable c_long '9223372036854775807l' -IP_DROP_SOURCE_MEMBERSHIP = 40 # Variable c_int '40' -__GLIBC_USE_IEC_60559_BFP_EXT_C2X = 1 # Variable c_int '1' -SO_SNDLOWAT = 19 # Variable c_int '19' -MNCC_HOLD_CNF = 288 # Variable c_int '288' -SOL_NFC = 280 # Variable c_int '280' -__GLIBC_USE_IEC_60559_BFP_EXT = 1 # Variable c_int '1' -SO_REUSEADDR = 2 # Variable c_int '2' -__GLIBC_USE_IEC_60559_FUNCS_EXT = 1 # Variable c_int '1' -PF_PPPOX = 24 # Variable c_int '24' -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 = 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 = 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 = 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' -IPV6_AUTHHDR = 10 # Variable c_int '10' -SO_ATTACH_REUSEPORT_CBPF = 51 # Variable c_int '51' -IP_DROP_MEMBERSHIP = 36 # Variable c_int '36' -MNCC_SETUP_REQ = 257 # Variable c_int '257' -SO_SECURITY_ENCRYPTION_TRANSPORT = 23 # Variable c_int '23' -IPV6_RTHDRDSTOPTS = 55 # Variable c_int '55' -IP_FREEBIND = 15 # Variable c_int '15' -__USE_XOPEN2K = 1 # Variable c_int '1' -__FD_SETSIZE = 1024 # Variable c_int '1024' -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' -PF_CAN = 29 # Variable c_int '29' -MNCC_RTP_FREE = 518 # Variable c_int '518' -PF_SNA = 22 # Variable c_int '22' -SOL_DCCP = 269 # Variable c_int '269' -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 = 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 = 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' -PF_IPX = 4 # Variable c_int '4' -MNCC_FACILITY_REQ = 275 # Variable c_int '275' -PF_INET6 = 10 # Variable c_int '10' -MNCC_RETRIEVE_IND = 290 # Variable c_int '290' -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 = 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' -IPV6_UNICAST_IF = 76 # Variable c_int '76' -IP_PMTUDISC_OMIT = 5 # Variable c_int '5' -_BITS_BYTESWAP_H = 1 # Variable c_int '1' -MCAST_EXCLUDE = 0 # Variable c_int '0' -IPV6_PMTUDISC_DONT = 0 # Variable c_int '0' -SO_ATTACH_REUSEPORT_EBPF = 52 # Variable c_int '52' -UINT16_MAX = 65535 # Variable c_int '65535' -MNCC_F_KEYPAD = 4096 # Variable c_int '4096' -PF_IEEE802154 = 36 # Variable c_int '36' -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 = 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' -__USE_POSIX199506 = 1 # Variable c_int '1' -IPV6_PATHMTU = 61 # Variable c_int '61' -__BIG_ENDIAN = 4321 # Variable c_int '4321' -MNCC_F_FACILITY = 512 # Variable c_int '512' -PF_NETLINK = 16 # Variable c_int '16' -__USE_XOPEN2K8XSI = 1 # Variable c_int '1' -__INO_T_MATCHES_INO64_T = 1 # Variable c_int '1' -SO_PEERCRED = 17 # Variable c_int '17' -PF_MAX = 45 # Variable c_int '45' -SO_RCVBUFFORCE = 33 # Variable c_int '33' -GSM_TCHF_FRAME = 768 # Variable c_int '768' -SO_SECURITY_AUTHENTICATION = 22 # Variable c_int '22' -SO_SECURITY_ENCRYPTION_NETWORK = 24 # Variable c_int '24' -SO_RCVTIMEO_OLD = 20 # Variable c_int '20' -__STATFS_MATCHES_STATFS64 = 1 # Variable c_int '1' -SO_NOFCS = 43 # Variable c_int '43' -FIOSETOWN = 35073 # Variable c_int '35073' -INT_LEAST16_MIN = -32768 # Variable c_int '-0x00000000000008000' -IP_UNBLOCK_SOURCE = 37 # Variable c_int '37' -_SYS_CDEFS_H = 1 # Variable c_int '1' -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 = 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' -SO_ATTACH_FILTER = 26 # Variable c_int '26' -INT_FAST32_MAX = 9223372036854775807 # Variable c_long '9223372036854775807l' -MNCC_F_BEARER_CAP = 1 # Variable c_int '1' -IPV6_RTHDR_LOOSE = 0 # Variable c_int '0' -PF_LLC = 26 # Variable c_int '26' -MCAST_UNBLOCK_SOURCE = 44 # Variable c_int '44' -_BITS_TIME64_H = 1 # Variable c_int '1' -_LARGEFILE_SOURCE = 1 # Variable c_int '1' -_STRUCT_TIMESPEC = 1 # Variable c_int '1' -PF_ECONET = 19 # Variable c_int '19' -__USE_XOPEN2KXSI = 1 # Variable c_int '1' -__LITTLE_ENDIAN = 1234 # Variable c_int '1234' -__have_pthread_attr_t = 1 # Variable c_int '1' -MNCC_F_CAUSE = 32 # Variable c_int '32' -SO_ATTACH_BPF = 50 # Variable c_int '50' -PF_RDS = 21 # Variable c_int '21' -UINT16_WIDTH = 16 # Variable c_int '16' -INT64_MAX = 9223372036854775807 # Variable c_long '9223372036854775807l' -__USE_XOPEN2K8 = 1 # Variable c_int '1' -IP_HDRINCL = 3 # Variable c_int '3' -IPV6_HDRINCL = 36 # Variable c_int '36' -GSM_TCH_FRAME_AMR = 771 # Variable c_int '771' -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 = 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' -MNCC_START_DTMF_REJ = 279 # Variable c_int '279' -IPV6_RTHDR_TYPE_0 = 0 # Variable c_int '0' -_SYS_SELECT_H = 1 # Variable c_int '1' -SO_PEERSEC = 31 # Variable c_int '31' -MCAST_BLOCK_SOURCE = 43 # Variable c_int '43' -SOL_BLUETOOTH = 274 # Variable c_int '274' -_ISOC95_SOURCE = 1 # Variable c_int '1' -SO_SNDBUFFORCE = 32 # Variable c_int '32' -_ISOC99_SOURCE = 1 # Variable c_int '1' -MCAST_INCLUDE = 1 # Variable c_int '1' -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' -IP_PKTOPTIONS = 9 # Variable c_int '9' -__SYSCALL_WORDSIZE = 64 # Variable c_int '64' -__USE_MISC = 1 # Variable c_int '1' -SO_DETACH_FILTER = 27 # Variable c_int '27' -MNCC_SOCKET_HELLO = 1024 # Variable c_int '1024' -__sigset_t_defined = 1 # Variable c_int '1' -__timer_t_defined = 1 # Variable c_int '1' -IPV6_LEAVE_GROUP = 21 # Variable c_int '21' -INT32_WIDTH = 32 # Variable c_int '32' -SO_SELECT_ERR_QUEUE = 45 # Variable c_int '45' -MCAST_MSFILTER = 48 # Variable c_int '48' -__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 = 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' -IPV6_RECVDSTOPTS = 58 # Variable c_int '58' -IPV6_MTU = 24 # Variable c_int '24' -_ISOC2X_SOURCE = 1 # Variable c_int '1' -SO_TIMESTAMP_NEW = 63 # Variable c_int '63' -IP_CHECKSUM = 23 # Variable c_int '23' -_SS_SIZE = 128 # Variable c_int '128' -_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 = 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' -IPV6_2292HOPOPTS = 3 # Variable c_int '3' -INT16_MAX = 32767 # Variable c_int '32767' -__SIZEOF_PTHREAD_MUTEX_T = 40 # Variable c_int '40' -__USE_UNIX98 = 1 # Variable c_int '1' -PF_ASH = 18 # Variable c_int '18' -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 = 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' -IN_CLASSA_NSHIFT = 24 # Variable c_int '24' -PF_BRIDGE = 7 # Variable c_int '7' -PF_XDP = 44 # Variable c_int '44' -INT_LEAST32_MIN = -2147483648 # Variable c_int '-0x00000000080000000' -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' -_BITS_PTHREADTYPES_ARCH_H = 1 # Variable c_int '1' -PF_PHONET = 35 # Variable c_int '35' -IPV6_RECVPATHMTU = 60 # Variable c_int '60' -IPV6_ADDR_PREFERENCES = 72 # Variable c_int '72' -GSM_MAX_SSVERSION = 128 # Variable c_int '128' -MNCC_ALERT_REQ = 266 # Variable c_int '266' -MNCC_START_DTMF_RSP = 278 # Variable c_int '278' -INET6_ADDRSTRLEN = 46 # Variable c_int '46' -IPV6_JOIN_ANYCAST = 27 # Variable c_int '27' -SIG_ATOMIC_MAX = 2147483647 # Variable c_int '2147483647' -SO_WIFI_STATUS = 41 # Variable c_int '41' -IP_RETOPTS = 7 # Variable c_int '7' -IPV6_JOIN_GROUP = 20 # Variable c_int '20' -SO_REUSEPORT = 15 # Variable c_int '15' -INT_FAST32_MIN = -9223372036854775808 # Variable c_long '-0x08000000000000000l' -SO_COOKIE = 57 # Variable c_int '57' -IPV6_MULTICAST_ALL = 29 # Variable c_int '29' -SOL_X25 = 262 # Variable c_int '262' -MNCC_SETUP_IND = 258 # Variable c_int '258' -PF_ATMSVC = 20 # Variable c_int '20' -MNCC_NOTIFY_REQ = 268 # Variable c_int '268' -MNCC_STOP_DTMF_IND = 280 # Variable c_int '280' -__SIZEOF_PTHREAD_RWLOCKATTR_T = 8 # Variable c_int '8' -__PDP_ENDIAN = 3412 # Variable c_int '3412' -SOL_NETLINK = 270 # Variable c_int '270' -IP_NODEFRAG = 22 # Variable c_int '22' -IPV6_PMTUDISC_INTERFACE = 4 # Variable c_int '4' -IP_TRANSPARENT = 19 # Variable c_int '19' -_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 = 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' -IP_MULTICAST_IF = 32 # Variable c_int '32' -INT_LEAST32_WIDTH = 32 # Variable c_int '32' -SO_RCVTIMEO_NEW = 66 # Variable c_int '66' -__USE_ISOC11 = 1 # Variable c_int '1' -SO_PASSSEC = 34 # Variable c_int '34' -__timeval_defined = 1 # Variable c_int '1' -_NETINET_IN_H = 1 # Variable c_int '1' -SIOCSPGRP = 35074 # Variable c_int '35074' -__kernel_long_t = c_long -__kernel_ulong_t = c_ulong -__kernel_ino_t = __kernel_ulong_t -__kernel_mode_t = c_uint -__kernel_pid_t = c_int -__kernel_ipc_pid_t = c_int -__kernel_uid_t = c_uint -__kernel_gid_t = c_uint -__kernel_suseconds_t = __kernel_long_t -__kernel_daddr_t = c_int -__kernel_uid32_t = c_uint -__kernel_gid32_t = c_uint -__kernel_size_t = __kernel_ulong_t -__kernel_ssize_t = __kernel_long_t -__kernel_ptrdiff_t = __kernel_long_t -class __kernel_fsid_t(Structure): - pass -__kernel_fsid_t._fields_ = [ - ('val', c_int * 2), -] -__kernel_off_t = __kernel_long_t -__kernel_loff_t = c_longlong -__kernel_old_time_t = __kernel_long_t -__kernel_time_t = __kernel_long_t -__kernel_time64_t = c_longlong -__kernel_clock_t = __kernel_long_t -__kernel_timer_t = c_int -__kernel_clockid_t = c_int -__kernel_caddr_t = STRING -__kernel_uid16_t = c_ushort -__kernel_gid16_t = c_ushort -__kernel_old_uid_t = c_ushort -__kernel_old_gid_t = c_ushort -__kernel_old_dev_t = c_ulong -class ip_opts(Structure): - pass -class in_addr(Structure): - pass -in_addr_t = uint32_t -in_addr._fields_ = [ - ('s_addr', in_addr_t), -] -ip_opts._fields_ = [ - ('ip_dst', in_addr), - ('ip_opts', c_char * 40), -] -class ip_mreqn(Structure): - pass -ip_mreqn._fields_ = [ - ('imr_multiaddr', in_addr), - ('imr_address', in_addr), - ('imr_ifindex', c_int), -] -class in_pktinfo(Structure): - pass -in_pktinfo._fields_ = [ - ('ipi_ifindex', c_int), - ('ipi_spec_dst', in_addr), - ('ipi_addr', in_addr), -] -pthread_t = c_ulong -pthread_key_t = c_uint -pthread_once_t = c_int -class pthread_attr_t(Union): - pass -pthread_spinlock_t = c_int -__socklen_t = c_uint -socklen_t = __socklen_t -class sockaddr(Structure): - pass -sockaddr._fields_ = [ - ('sa_family', sa_family_t), - ('sa_data', c_char * 14), + +struct_gsm_mncc_number._pack_ = 1 # source:False +struct_gsm_mncc_number._fields_ = [ + ('type', ctypes.c_int32), + ('plan', ctypes.c_int32), + ('present', ctypes.c_int32), + ('screen', ctypes.c_int32), + ('number', ctypes.c_char * 33), + ('PADDING_0', ctypes.c_ubyte * 3), ] -# values for unnamed enumeration -class msghdr(Structure): +class struct_gsm_mncc_cause(Structure): pass -class iovec(Structure): - pass -size_t = c_ulong -msghdr._fields_ = [ - ('msg_name', c_void_p), - ('msg_namelen', socklen_t), - ('msg_iov', POINTER(iovec)), - ('msg_iovlen', size_t), - ('msg_control', c_void_p), - ('msg_controllen', size_t), - ('msg_flags', c_int), -] -class cmsghdr(Structure): - pass -cmsghdr._fields_ = [ - ('cmsg_len', size_t), - ('cmsg_level', c_int), - ('cmsg_type', c_int), - ('__cmsg_data', c_ubyte * 0), + +struct_gsm_mncc_cause._pack_ = 1 # source:False +struct_gsm_mncc_cause._fields_ = [ + ('location', ctypes.c_int32), + ('coding', ctypes.c_int32), + ('rec', ctypes.c_int32), + ('rec_val', ctypes.c_int32), + ('value', ctypes.c_int32), + ('diag_len', ctypes.c_int32), + ('diag', ctypes.c_char * 32), ] -# values for unnamed enumeration -class ucred(Structure): +class struct_gsm_mncc_useruser(Structure): pass -__pid_t = c_int -pid_t = __pid_t -__uid_t = c_uint -uid_t = __uid_t -__gid_t = c_uint -gid_t = __gid_t -ucred._fields_ = [ - ('pid', pid_t), - ('uid', uid_t), - ('gid', gid_t), -] -class linger(Structure): - pass -linger._fields_ = [ - ('l_onoff', c_int), - ('l_linger', c_int), + +struct_gsm_mncc_useruser._pack_ = 1 # source:False +struct_gsm_mncc_useruser._fields_ = [ + ('proto', ctypes.c_int32), + ('info', ctypes.c_char * 129), + ('PADDING_0', ctypes.c_ubyte * 3), ] -# values for enumeration '__socket_type' -__socket_type = c_int # enum -__int8_t = c_byte -int8_t = __int8_t -__int16_t = c_short -int16_t = __int16_t -__int32_t = c_int -int32_t = __int32_t -__int64_t = c_long -int64_t = __int64_t -__uint8_t = c_ubyte -uint8_t = __uint8_t -__uint16_t = c_ushort -uint16_t = __uint16_t -__uint64_t = c_ulong -uint64_t = __uint64_t -class __pthread_mutex_s(Structure): +class struct_gsm_mncc_progress(Structure): pass -class __pthread_internal_list(Structure): - pass -__pthread_internal_list._fields_ = [ - ('__prev', POINTER(__pthread_internal_list)), - ('__next', POINTER(__pthread_internal_list)), -] -__pthread_list_t = __pthread_internal_list -__pthread_mutex_s._fields_ = [ - ('__lock', c_int), - ('__count', c_uint), - ('__owner', c_int), - ('__nusers', c_uint), - ('__kind', c_int), - ('__spins', c_short), - ('__elision', c_short), - ('__list', __pthread_list_t), -] -class __pthread_rwlock_arch_t(Structure): - pass -__pthread_rwlock_arch_t._fields_ = [ - ('__readers', c_uint), - ('__writers', c_uint), - ('__wrphase_futex', c_uint), - ('__writers_futex', c_uint), - ('__pad3', c_uint), - ('__pad4', c_uint), - ('__cur_writer', c_int), - ('__shared', c_int), - ('__rwelision', c_byte), - ('__pad1', c_ubyte * 7), - ('__pad2', c_ulong), - ('__flags', c_uint), -] -class __pthread_internal_slist(Structure): - pass -__pthread_internal_slist._fields_ = [ - ('__next', POINTER(__pthread_internal_slist)), -] -__pthread_slist_t = __pthread_internal_slist -class __pthread_cond_s(Structure): - pass -class N16__pthread_cond_s3DOT_3E(Union): - pass -class N16__pthread_cond_s3DOT_33DOT_4E(Structure): - pass -N16__pthread_cond_s3DOT_33DOT_4E._fields_ = [ - ('__low', c_uint), - ('__high', c_uint), -] -N16__pthread_cond_s3DOT_3E._fields_ = [ - ('__wseq', c_ulonglong), - ('__wseq32', N16__pthread_cond_s3DOT_33DOT_4E), -] -class N16__pthread_cond_s3DOT_5E(Union): - pass -class N16__pthread_cond_s3DOT_53DOT_6E(Structure): - pass -N16__pthread_cond_s3DOT_53DOT_6E._fields_ = [ - ('__low', c_uint), - ('__high', c_uint), -] -N16__pthread_cond_s3DOT_5E._fields_ = [ - ('__g1_start', c_ulonglong), - ('__g1_start32', N16__pthread_cond_s3DOT_53DOT_6E), -] -__pthread_cond_s._anonymous_ = ['_0', '_1'] -__pthread_cond_s._fields_ = [ - ('_0', N16__pthread_cond_s3DOT_3E), - ('_1', N16__pthread_cond_s3DOT_5E), - ('__g_refs', c_uint * 2), - ('__g_size', c_uint * 2), - ('__g1_orig_size', c_uint), - ('__wrefs', c_uint), - ('__g_signals', c_uint * 2), -] -__tss_t = c_uint -__thrd_t = c_ulong -class __once_flag(Structure): - pass -__once_flag._fields_ = [ - ('__data', c_int), -] -__u_char = c_ubyte -__u_short = c_ushort -__u_int = c_uint -__u_long = c_ulong -__int_least8_t = __int8_t -__uint_least8_t = __uint8_t -__int_least16_t = __int16_t -__uint_least16_t = __uint16_t -__int_least32_t = __int32_t -__uint_least32_t = __uint32_t -__int_least64_t = __int64_t -__uint_least64_t = __uint64_t -__quad_t = c_long -__u_quad_t = c_ulong -__intmax_t = c_long -__uintmax_t = c_ulong -__dev_t = c_ulong -__ino_t = c_ulong -__ino64_t = c_ulong -__mode_t = c_uint -__nlink_t = c_ulong -__off_t = c_long -__off64_t = c_long -class __fsid_t(Structure): - pass -__fsid_t._fields_ = [ - ('__val', c_int * 2), -] -__clock_t = c_long -__rlim_t = c_ulong -__rlim64_t = c_ulong -__id_t = c_uint -__time_t = c_long -__useconds_t = c_uint -__suseconds_t = c_long -__suseconds64_t = c_long -__daddr_t = c_int -__key_t = c_int -__clockid_t = c_int -__timer_t = c_void_p -__blksize_t = c_long -__blkcnt_t = c_long -__blkcnt64_t = c_long -__fsblkcnt_t = c_ulong -__fsblkcnt64_t = c_ulong -__fsfilcnt_t = c_ulong -__fsfilcnt64_t = c_ulong -__fsword_t = c_long -__ssize_t = c_long -__syscall_slong_t = c_long -__syscall_ulong_t = c_ulong -__loff_t = __off64_t -__caddr_t = STRING -__intptr_t = c_long -__sig_atomic_t = c_int -class __sigset_t(Structure): - pass -__sigset_t._fields_ = [ - ('__val', c_ulong * 16), -] -clock_t = __clock_t -clockid_t = __clockid_t -sigset_t = __sigset_t -iovec._fields_ = [ - ('iov_base', c_void_p), - ('iov_len', size_t), -] -class osockaddr(Structure): - pass -osockaddr._fields_ = [ - ('sa_family', c_ushort), - ('sa_data', c_ubyte * 14), -] -class timespec(Structure): - pass -timespec._fields_ = [ - ('tv_sec', __time_t), - ('tv_nsec', __syscall_slong_t), -] -class timeval(Structure): - pass -timeval._fields_ = [ - ('tv_sec', __time_t), - ('tv_usec', __suseconds_t), -] -time_t = __time_t -timer_t = __timer_t -class __kernel_fd_set(Structure): - pass -__kernel_fd_set._fields_ = [ - ('fds_bits', c_ulong * 16), -] -__kernel_sighandler_t = CFUNCTYPE(None, c_int) -__kernel_key_t = c_int -__kernel_mqd_t = c_int -# values for unnamed enumeration +struct_gsm_mncc_progress._pack_ = 1 # source:False +struct_gsm_mncc_progress._fields_ = [ + ('coding', ctypes.c_int32), + ('location', ctypes.c_int32), + ('descr', ctypes.c_int32), +] -# values for unnamed enumeration -in_port_t = uint16_t +class struct_gsm_mncc_facility(Structure): + pass -# values for unnamed enumeration -class in6_addr(Structure): - pass -class N8in6_addr4DOT_24E(Union): - pass -N8in6_addr4DOT_24E._fields_ = [ - ('__u6_addr8', uint8_t * 16), - ('__u6_addr16', uint16_t * 8), - ('__u6_addr32', uint32_t * 4), +struct_gsm_mncc_facility._pack_ = 1 # source:False +struct_gsm_mncc_facility._fields_ = [ + ('len', ctypes.c_int32), + ('info', ctypes.c_char * 128), ] -in6_addr._fields_ = [ - ('__in6_u', N8in6_addr4DOT_24E), -] -class sockaddr_in(Structure): - pass -sockaddr_in._fields_ = [ - ('sin_family', sa_family_t), - ('sin_port', in_port_t), - ('sin_addr', in_addr), - ('sin_zero', c_ubyte * 8), -] -class sockaddr_in6(Structure): - pass -sockaddr_in6._fields_ = [ - ('sin6_family', sa_family_t), - ('sin6_port', in_port_t), - ('sin6_flowinfo', uint32_t), - ('sin6_addr', in6_addr), - ('sin6_scope_id', uint32_t), -] -class ip_mreq(Structure): - pass -ip_mreq._fields_ = [ - ('imr_multiaddr', in_addr), - ('imr_interface', in_addr), -] -class ip_mreq_source(Structure): - pass -ip_mreq_source._fields_ = [ - ('imr_multiaddr', in_addr), - ('imr_interface', in_addr), - ('imr_sourceaddr', in_addr), -] -class ipv6_mreq(Structure): - pass -ipv6_mreq._fields_ = [ - ('ipv6mr_multiaddr', in6_addr), - ('ipv6mr_interface', c_uint), -] -class group_req(Structure): - pass -group_req._fields_ = [ - ('gr_interface', uint32_t), - ('gr_group', sockaddr_storage), -] -class group_source_req(Structure): - pass -group_source_req._fields_ = [ - ('gsr_interface', uint32_t), - ('gsr_group', sockaddr_storage), - ('gsr_source', sockaddr_storage), -] -class ip_msfilter(Structure): - pass -ip_msfilter._fields_ = [ - ('imsf_multiaddr', in_addr), - ('imsf_interface', in_addr), - ('imsf_fmode', uint32_t), - ('imsf_numsrc', uint32_t), - ('imsf_slist', in_addr * 1), -] -class group_filter(Structure): - pass -group_filter._fields_ = [ - ('gf_interface', uint32_t), - ('gf_group', sockaddr_storage), - ('gf_fmode', uint32_t), - ('gf_numsrc', uint32_t), - ('gf_slist', sockaddr_storage * 1), -] -class in6_pktinfo(Structure): - pass -in6_pktinfo._fields_ = [ - ('ipi6_addr', in6_addr), - ('ipi6_ifindex', c_uint), -] -class ip6_mtuinfo(Structure): - pass -ip6_mtuinfo._fields_ = [ - ('ip6m_addr', sockaddr_in6), - ('ip6m_mtu', uint32_t), -] -int_least8_t = __int_least8_t -int_least16_t = __int_least16_t -int_least32_t = __int_least32_t -int_least64_t = __int_least64_t -uint_least8_t = __uint_least8_t -uint_least16_t = __uint_least16_t -uint_least32_t = __uint_least32_t -uint_least64_t = __uint_least64_t -int_fast8_t = c_byte -int_fast16_t = c_long -int_fast32_t = c_long -int_fast64_t = c_long -uint_fast8_t = c_ubyte -uint_fast16_t = c_ulong -uint_fast32_t = c_ulong -uint_fast64_t = c_ulong -intptr_t = c_long -uintptr_t = c_ulong -intmax_t = __intmax_t -uintmax_t = __uintmax_t -__fd_mask = c_long -class fd_set(Structure): - pass -fd_set._fields_ = [ - ('fds_bits', __fd_mask * 16), -] -fd_mask = __fd_mask -# values for unnamed enumeration -class mmsghdr(Structure): +class struct_gsm_mncc_ssversion(Structure): pass -mmsghdr._fields_ = [ - ('msg_hdr', msghdr), - ('msg_len', c_uint), + +struct_gsm_mncc_ssversion._pack_ = 1 # source:False +struct_gsm_mncc_ssversion._fields_ = [ + ('len', ctypes.c_int32), + ('info', ctypes.c_char * 128), ] -u_char = __u_char -u_short = __u_short -u_int = __u_int -u_long = __u_long -quad_t = __quad_t -u_quad_t = __u_quad_t -fsid_t = __fsid_t -loff_t = __loff_t -ino_t = __ino_t -ino64_t = __ino64_t -dev_t = __dev_t -mode_t = __mode_t -nlink_t = __nlink_t -off_t = __off_t -off64_t = __off64_t -id_t = __id_t -ssize_t = __ssize_t -daddr_t = __daddr_t -caddr_t = __caddr_t -key_t = __key_t -useconds_t = __useconds_t -suseconds_t = __suseconds_t -ulong = c_ulong -ushort = c_ushort -uint = c_uint -u_int8_t = __uint8_t -u_int16_t = __uint16_t -u_int32_t = __uint32_t -u_int64_t = __uint64_t -register_t = c_long -blksize_t = __blksize_t -blkcnt_t = __blkcnt_t -fsblkcnt_t = __fsblkcnt_t -fsfilcnt_t = __fsfilcnt_t -blkcnt64_t = __blkcnt64_t -fsblkcnt64_t = __fsblkcnt64_t -fsfilcnt64_t = __fsfilcnt64_t -pthread_attr_t._fields_ = [ - ('__size', c_char * 56), - ('__align', c_long), + +class struct_gsm_mncc_cccap(Structure): + pass + +struct_gsm_mncc_cccap._pack_ = 1 # source:False +struct_gsm_mncc_cccap._fields_ = [ + ('dtmf', ctypes.c_int32), + ('pcp', ctypes.c_int32), ] -__all__ = ['gsm_mncc_number', 'GSM48_BCAP_ITCAP_OTHER', - 'SOL_PPPOL2TP', 'MNCC_SETUP_CNF', '__pthread_mutex_s', - 'socklen_t', 'int_fast32_t', 'INT_FAST64_WIDTH', - 'SO_RCVBUF', 'MNCC_REL_CNF', 'MSG_DONTROUTE', - 'IPV6_FREEBIND', '_ATFILE_SOURCE', 'IP_RECVFRAGSIZE', - '__kernel_gid16_t', 'MNCC_RTP_CREATE', 'SO_PASSCRED', - 'GSM48_BCAP_TMOD_PACKET', '__once_flag', 'uint8_t', - 'gsm_mncc_progress', 'IP_PASSSEC', '__kernel_size_t', - 'MNCC_FACILITY_IND', 'IPV6_DSTOPTS', - 'GSM48_BCAP_ITCAP_RESERVED', 'IPPORT_ROUTESERVER', - '__SIZEOF_PTHREAD_CONDATTR_T', 'SOL_AAL', - 'SO_TIMESTAMPING_NEW', '__kernel_daddr_t', - '_BITS_PTHREADTYPES_COMMON_H', '__pthread_internal_list', - 'INT_FAST16_MIN', 'MSG_CTRUNC', 'IPPROTO_RSVP', - 'GSM_MNCC_BCAP_UNR_DIG', 'SO_OOBINLINE', 'IP_RECVERR', - 'IN_CLASSA_HOST', 'SOCK_RDM', 'IPPROTO_AH', - '__time_t_defined', 'INT_LEAST16_MAX', '__NFDBITS', - 'in_port_t', 'MSG_RST', 'IPPORT_MTP', 'IPPORT_TTYLINK', - 'GSM48_BCAP_TR_RLP', 'IPV6_RECVFRAGSIZE', '_POSIX_SOURCE', - 'uint_fast16_t', 'in_pktinfo', 'PF_ISDN', - 'SO_SELECT_ERR_QUEUE', '__ssize_t', '__kernel_loff_t', - 'N16__pthread_cond_s3DOT_33DOT_4E', 'fsfilcnt_t', - '__off_t', 'INT_LEAST8_MIN', 'MNCC_REL_IND', '__uint64_t', - 'INT_FAST64_MIN', 'timespec', 'INT16_WIDTH', '__off64_t', - 'SOL_CAIF', 'SO_MARK', 'IPV6_HOPLIMIT', 'ucred', - 'MSG_NOSIGNAL', '__USE_POSIX199309', 'MNCC_RTP_CONNECT', - '__clockid_t', 'INT_LEAST16_WIDTH', 'osockaddr', - 'IPPROTO_RAW', 'SOL_IUCV', 'SO_BROADCAST', - 'GSM48_BCAP_SA_I440_I450', '__GLIBC_USE_DEPRECATED_SCANF', - 'id_t', 'MSG_TRYHARD', '__USE_ISOCXX11', 'SO_DEBUG', - 'MNCC_CALL_CONF_IND', 'PF_SECURITY', 'MNCC_F_USERUSER', - 'in_addr', 'IP_MULTICAST_ALL', 'SOCK_CLOEXEC', 'PF_ALG', - '__SIZEOF_PTHREAD_BARRIER_T', 'INTMAX_WIDTH', - 'IPPROTO_ENCAP', 'IPPROTO_ESP', 'GSM_MNCC_BCAP_SPEECH', - 'IP_DEFAULT_MULTICAST_TTL', 'SHUT_RD', 'SOL_RDS', - 'PF_IUCV', 'ip_mreq_source', 'MCAST_JOIN_SOURCE_GROUP', - 'SCM_RIGHTS', 'INADDR_NONE', 'IPV6_RECVPATHMTU', - 'IPV6_RTHDR', '__kernel_fsid_t', 'GSM48_BCAP_PAR_ZERO', - 'IPV6_V6ONLY', '__kernel_sighandler_t', - '_BITS_ENDIANNESS_H', 'uint_fast8_t', 'IPV6_PMTUDISC_DO', - 'IP_MTU', 'GSM48_BCAP_RA_OTHER', 'IPPROTO_TCP', 'INT8_MAX', - '__osockaddr_defined', '__USE_KERNEL_IPV6_DEFS', - 'gsm48_bcap_rrq', '__int16_t', 'ipv6_mreq', - 'SO_INCOMING_NAPI_ID', 'timer_t', '__GLIBC_USE_LIB_EXT2', - 'INET_ADDRSTRLEN', 'SO_DETACH_REUSEPORT_BPF', - 'MNCC_USERINFO_REQ', 'u_quad_t', - 'N16__pthread_cond_s3DOT_3E', '__kernel_old_uid_t', - '__loff_t', 'INADDR_BROADCAST', 'IPV6_RECVDSTOPTS', - 'gsm48_bcap_transp', '__pthread_cond_s', 'INTPTR_MIN', - '__int32_t', 'PF_MPLS', 'uint_least32_t', 'IPPROTO_MPTCP', - '__BIG_ENDIAN', '_ENDIAN_H', 'INADDR_ALLSNOOPERS_GROUP', - '__kernel_uid16_t', 'FIOGETOWN', 'MCAST_JOIN_GROUP', - '__USE_FORTIFY_LEVEL', '__int8_t', 'IPV6_ORIGDSTADDR', - '__fsblkcnt64_t', 'PTRDIFF_MAX', '__USE_XOPEN2K8', - 'MSG_EOR', 'INT32_MIN', '__kernel_time64_t', 'MSG_SYN', - '__USE_XOPEN_EXTENDED', 'IPPROTO_MH', 'MNCC_F_FACILITY', - 'INT_LEAST32_MAX', 'pid_t', 'IP_PKTINFO', 'linger', - 'UINT32_WIDTH', '__fsfilcnt64_t', 'PF_BLUETOOTH', - 'PF_IRDA', 'SO_DONTROUTE', 'pthread_key_t', - 'IPV6_2292RTHDR', 'MNCC_REJ_IND', 'IPPORT_TFTP', - 'PF_APPLETALK', 'group_req', 'SO_TYPE', 'IPPORT_NETSTAT', - 'off_t', 'IPV6_PMTUDISC_PROBE', 'GSM48_BCAP_UR_300', - '__fsblkcnt_t', 'PF_VSOCK', 'MNCC_SETUP_COMPL_REQ', - 'IPV6_DONTFRAG', 'SOL_PACKET', 'MNCC_START_DTMF_IND', - 'sa_family_t', 'UINT_FAST16_MAX', - 'N16__pthread_cond_s3DOT_53DOT_6E', '__WORDSIZE', - 'GSM_TCHF_FRAME', 'MNCC_FRAME_DROP', 'SOL_RXRPC', - 'INT_FAST8_MIN', 'time_t', '_XOPEN_SOURCE', 'u_short', - 'SO_KEEPALIVE', 'cmsghdr', 'WINT_MIN', 'key_t', - '__USE_ISOC95', 'IN_CLASSA_MAX', 'MNCC_ALERT_IND', - 'PF_X25', 'IPPORT_CMDSERVER', 'sockaddr_in6', - 'IN_CLASSC_NSHIFT', 'IP_PMTUDISC_DO', '__GLIBC__', - 'SO_LOCK_FILTER', 'N8in6_addr4DOT_24E', '__USE_ISOC99', - 'IP_UNICAST_IF', 'PF_AX25', 'MNCC_F_SSVERSION', - '__pthread_internal_slist', 'SO_PASSSEC', - 'IPV6_MULTICAST_LOOP', '__kernel_uid_t', 'SOL_TLS', - 'ip_mreq', '__clock_t', 'IPV6_HOPOPTS', 'SOL_LLC', - '__fsfilcnt_t', 'PF_WANPIPE', 'IPV6_RECVERR', - 'INT_LEAST8_MAX', 'IPPORT_RESERVED', 'SOL_NETBEUI', - 'SO_BUSY_POLL', '__sig_atomic_t', '__time_t', - 'IN_CLASSB_HOST', 'size_t', '__USE_XOPEN', 'PF_ROSE', - 'IPV6_ADDRFORM', 'SOCK_SEQPACKET', 'MNCC_PROGRESS_REQ', - 'PF_SMC', '__USE_POSIX2', 'MNCC_NOTIFY_IND', - 'INT_LEAST64_WIDTH', 'GSM48_BCAP_TR_RLP_PREF', - '__iovec_defined', 'blkcnt_t', 'IPV6_RECVRTHDR', - '__syscall_slong_t', 'blkcnt64_t', '__timer_t', 'SOL_IRDA', - 'MNCC_LCHAN_MODIFY', 'GSM_MAX_FACILITY', 'INT64_WIDTH', - 'IP_PMTUDISC', 'GSM48_BCAP_SA_X21', 'uint_fast64_t', - 'SO_TIMESTAMPNS_NEW', 'SO_PRIORITY', 'UINT64_MAX', - 'MSG_TRUNC', 'u_char', 'IN_CLASSB_MAX', 'SO_LINGER', - 'uid_t', '__USE_ATFILE', 'INTMAX_MAX', 'u_int16_t', - 'PF_CAIF', 'IP_MAX_MEMBERSHIPS', 'quad_t', - '__GLIBC_USE_IEC_60559_FUNCS_EXT', 'UINT_LEAST16_WIDTH', - 'INTMAX_MIN', 'MSG_OOB', 'GSM48_BCAP_UR_12000', - 'GSM48_BCAP_PAR_EVEN', 'SO_SECURITY_ENCRYPTION_NETWORK', - 'IP_RECVOPTS', 'UINT_LEAST8_WIDTH', 'UINT_FAST8_MAX', - 'IPPROTO_IP', 'N19gsm_mncc_bearer_cap4DOT_25E', - 'IP_RECVTOS', 'GSM48_BCAP_UR_1200', 'pthread_spinlock_t', - 'GSM48_BCAP_MT_V26ter', '__kernel_fd_set', - 'IPPORT_USERRESERVED', 'MCAST_LEAVE_SOURCE_GROUP', - 'SO_PEERNAME', '__BITS_PER_LONG', '_BITS_STDINT_INTN_H', - 'INT_FAST64_MAX', 'SOCK_STREAM', '__fd_mask', - 'IPV6_RECVPKTINFO', 'MNCC_BRIDGE', - 'GSM48_BCAP_CODING_GSM_STD', 'clock_t', 'MNCC_F_CALLED', - 'IPV6_RTHDR_STRICT', 'IPPROTO_PUP', 'int_fast64_t', - 'IPV6_RECVHOPOPTS', 'WINT_MAX', '_BITS_WCHAR_H', - '__GLIBC_MINOR__', '__GLIBC_USE_IEC_60559_BFP_EXT_C2X', - 'IPV6_IPSEC_POLICY', 'SO_ZEROCOPY', - '__SOCKADDR_COMMON_SIZE', '__clockid_t_defined', - 'SO_ACCEPTCONN', 'IPPORT_SUPDUP', 'IP_MULTICAST_LOOP', - 'IPV6_AUTOFLOWLABEL', 'IPPORT_DISCARD', - 'GSM48_BCAP_PAR_ODD', 'uint_least8_t', 'GSM48_BCAP_RA_X31', - 'gsm_mncc_bearer_cap', 'IPV6_MINHOPCOUNT', 'fd_mask', - 'IP_OPTIONS', 'SO_RCVLOWAT', 'SHUT_RDWR', - 'INT_FAST8_WIDTH', '__WORDSIZE_TIME64_COMPAT32', - 'gsm_data_frame', 'IN_CLASSB_NSHIFT', '_SYS_TYPES_H', - 'SO_MEMINFO', 'PF_NETBEUI', '__HAVE_GENERIC_SELECTION', - 'IP_TOS', 'GSM48_BCAP_MT_NONE', '__kernel_ulong_t', - 'N8gsm_mncc4DOT_27E', 'IP_BIND_ADDRESS_NO_PORT', - 'MSG_WAITALL', '__USE_GNU', - '__GLIBC_USE_IEC_60559_FUNCS_EXT_C2X', '__pthread_list_t', - 'INT8_MIN', 'pthread_attr_t', 'GSM48_BCAP_RA_NONE', - '__ino_t', 'SIOCGSTAMP_OLD', '__rlim64_t', 'ino_t', - 'MNCC_MODIFY_IND', 'SOL_IPV6', 'GSM48_BCAP_SV_EFR', - '_POSIX_C_SOURCE', 'IPPROTO_ICMP', 'MNCC_F_SIGNAL', - 'IPPROTO_HOPOPTS', 'IPPORT_DAYTIME', 'gsm48_bcap_itcap', - '__blksize_t', '__SIZEOF_PTHREAD_MUTEXATTR_T', - 'SO_SNDTIMEO_OLD', '__pthread_slist_t', - 'IPV6_2292PKTOPTIONS', 'UINT_LEAST64_WIDTH', - 'MNCC_DISC_IND', '_DEFAULT_SOURCE', 'IPPROTO_IDP', - 'SO_CNX_ADVICE', 'gsm_mncc_useruser', 'SOCK_DGRAM', - 'PF_UNSPEC', 'GSM48_BCAP_RA_V110_X30', 'ino64_t', - 'IPPORT_WHOSERVER', 'UINT_LEAST64_MAX', 'IP_BLOCK_SOURCE', - 'gsm48_bcap_coding', 'UINT_FAST64_MAX', - 'IP_PMTUDISC_INTERFACE', '__uint8_t', 'nlink_t', - '__SIZEOF_PTHREAD_RWLOCK_T', 'IP_XFRM_POLICY', - '_THREAD_SHARED_TYPES_H', 'SOL_PNPIPE', 'IP_TTL', - '__caddr_t', '_SYS_SOCKET_H', '__blkcnt64_t', 'PF_TIPC', - 'MNCC_MODIFY_CNF', 'gsm_mncc_rtp', 'GSM_MNCC_BCAP_AUDIO', - '__kernel_suseconds_t', 'GSM48_BCAP_RRQ_FR_ONLY', - '__USE_POSIX199506', '__int_least64_t', - 'IPPORT_NAMESERVER', 'INT_LEAST64_MIN', '__USE_LARGEFILE', - '__SIZEOF_PTHREAD_COND_T', 'PTRDIFF_MIN', '_FEATURES_H', - 'GSM_MNCC_BCAP_OTHER_ITC', '__kernel_long_t', 'int16_t', - 'MSG_BATCH', 'SIG_ATOMIC_WIDTH', 'SOL_ATM', - 'MNCC_MODIFY_REQ', '_BITS_TYPES_H', - 'IP_DEFAULT_MULTICAST_LOOP', '__kernel_ptrdiff_t', - 'IN_CLASSA_NSHIFT', 'group_filter', 'IP_MSFILTER', - 'GSM48_BCAP_TMOD_CIRCUIT', 'PF_DECnet', '__u_int', - '__kernel_ipc_pid_t', 'INT_LEAST8_WIDTH', 'IP_MINTTL', - 'MSG_DONTWAIT', 'MNCC_MODIFY_REJ', 'PF_QIPCRTR', - '__kernel_off_t', 'IP_PMTUDISC_DONT', 'GSM48_BCAP_IR_8k', - 'intptr_t', 'GSM48_BCAP_ITCAP_SPEECH', - '_XOPEN_SOURCE_EXTENDED', 'SIOCGSTAMPNS_OLD', '__int64_t', - 'IN_LOOPBACKNET', '_BITS_TIME64_H', 'PF_LOCAL', - 'IPPROTO_SCTP', '__u_char', '__id_t', '__gid_t', - 'MNCC_RETRIEVE_CNF', 'MNCC_F_EMERGENCY', 'IPPROTO_MTP', - 'ssize_t', 'ulong', 'GSM48_BCAP_ITCAP_UNR_DIG_INF', - 'MNCC_REJ_REQ', 'IPV6_TCLASS', 'INT_FAST8_MAX', - 'UINT64_WIDTH', 'SO_BINDTOIFINDEX', '__int_least8_t', - 'MSG_MORE', 'SOL_SOCKET', 'INTPTR_MAX', - 'GSM48_BCAP_SV_AMR_H', 'IPV6_2292DSTOPTS', - 'MNCC_F_CALLING', 'fsblkcnt_t', 'IPPROTO_UDP', - 'GSM48_BCAP_SV_AMR_F', 'MNCC_CALL_PROC_REQ', 'suseconds_t', - 'IPPORT_RJE', 'IPPORT_ECHO', '__quad_t', 'SIOCGPGRP', - '_BITS_STDINT_UINTN_H', 'dev_t', '__uid_t', - 'IP_ADD_MEMBERSHIP', 'GSM_BAD_FRAME', - '__GLIBC_USE_DEPRECATED_GETS', - 'GSM48_BCAP_ITCAP_3k1_AUDIO', '__uint16_t', 'PF_NETROM', - '__glibc_c99_flexarr_available', 'GSM48_BCAP_PAR_ONE', - 'IPPROTO_TP', 'GSM48_BCAP_RRQ_DUAL_FR', 'IPPROTO_ETHERNET', - 'GSM48_BCAP_UR_9600', 'PF_ECONET', '__GNU_LIBRARY__', - '_BITS_TYPESIZES_H', '__kernel_gid32_t', 'mode_t', - 'IP_RECVTTL', '__USE_LARGEFILE64', '__kernel_old_time_t', - 'MNCC_STOP_DTMF_RSP', 'SO_ERROR', 'IPPORT_TELNET', 'uint', - 'MCAST_LEAVE_GROUP', '_LARGEFILE_SOURCE', - 'IPV6_RECVHOPLIMIT', 'uintptr_t', 'UINT8_MAX', - '__kernel_mode_t', 'SOCK_DCCP', 'IP_ORIGDSTADDR', - 'UINTMAX_MAX', '__LITTLE_ENDIAN', 'PF_XDP', - '__kernel_old_dev_t', '__kernel_pid_t', 'int_fast8_t', - 'GSM_TCHF_FRAME_EFR', 'IN_CLASSA_NET', '__tss_t', - 'SOL_TIPC', 'IPV6_MULTICAST_IF', 'IPPROTO_UDPLITE', - 'MNCC_SETUP_COMPL_IND', 'INT32_MAX', 'GSM48_BCAP_IR_16k', - 'gsm48_bcap_speech_ver', 'IP_DROP_SOURCE_MEMBERSHIP', - 'INT64_MIN', 'IPPROTO_MAX', 'ip_mreqn', 'MNCC_HOLD_IND', - 'IP_ADD_SOURCE_MEMBERSHIP', 'MNCC_HOLD_CNF', 'SOL_NFC', - '__thrd_t', 'SO_REUSEADDR', '__fsid_t', 'SO_BINDTODEVICE', - 'GSM48_BCAP_SA_X32', 'PF_PPPOX', 'SO_BSDCOMPAT', - 'int_fast16_t', '__kernel_clockid_t', 'IPPORT_WHOIS', - '__RLIM_T_MATCHES_RLIM64_T', '__kernel_old_gid_t', - 'IN_CLASSC_HOST', 'PF_RXRPC', 'sockaddr_in', - '__LDOUBLE_REDIRECTS_TO_FLOAT128_ABI', 'UINT_LEAST32_MAX', - '__sigset_t', '_BITS_PTHREADTYPES_ARCH_H', - 'GSM48_BCAP_TR_TRANSP', 'SO_SNDBUF', '__suseconds64_t', - 'SO_PEEK_OFF', 'ip6_mtuinfo', 'SOCK_NONBLOCK', - 'WINT_WIDTH', 'UINT32_MAX', 'MNCC_F_PROGRESS', - 'MNCC_HOLD_REJ', 'IPPROTO_ICMPV6', 'IPV6_UNICAST_HOPS', - 'MNCC_REL_REQ', 'SO_ATTACH_REUSEPORT_CBPF', - 'GSM48_BCAP_PAR_NONE', 'INT64_MAX', 'MSG_ERRQUEUE', - '__USE_XOPEN2K', 'MNCC_SETUP_REQ', 'IPV6_MTU_DISCOVER', - 'IPV6_RTHDRDSTOPTS', 'IPPROTO_IGMP', 'IP_FREEBIND', - 'IP_DROP_MEMBERSHIP', 'INT8_WIDTH', '__FD_SETSIZE', - 'INT_LEAST16_MIN', 'GSM48_BCAP_MT_V22bis', 'SIOCATMARK', - 'IPV6_PKTINFO', 'IPPROTO_IPV6', 'UINTMAX_WIDTH', 'PF_CAN', - 'MNCC_RTP_FREE', 'PF_SNA', 'uint64_t', 'IP_HDRINCL', - 'SOL_DCCP', 'SO_NO_CHECK', '__uint_least8_t', '__blkcnt_t', - 'gsm_mncc_cccap', 'clockid_t', '__GLIBC_USE_ISOC2X', - 'SOL_ICMPV6', 'UINTPTR_MAX', 'IPV6_ROUTER_ALERT', - 'IPPROTO_DCCP', 'msghdr', 'gsm48_bcap_user_rate', - 'uint16_t', '__kernel_mqd_t', 'GSM48_BCAP_SV_FR', - '__SIZEOF_PTHREAD_BARRIERATTR_T', 'INT16_MIN', - 'IP_PMTUDISC_PROBE', 'SHUT_WR', 'IP_ROUTER_ALERT', - 'int32_t', 'off64_t', 'GSM_MAX_USERUSER', 'UINT8_WIDTH', - 'IN_CLASSC_NET', 'INT_LEAST64_MAX', - 'GSM48_BCAP_SA_X28_DP_IN', 'GSM_MNCC_BCAP_FAX_G3', - 'PF_INET', 'IPV6_MULTICAST_HOPS', '__intptr_t', 'PF_IPX', - 'MNCC_FACILITY_REQ', 'PF_INET6', 'group_source_req', - 'MNCC_RETRIEVE_IND', 'SOL_DECNET', 'PF_KCM', 'in6_addr', - 'IPPROTO_EGP', 'MNCC_F_CONNECTED', 'IN_CLASSB_NET', - 'gsm48_bcap_tmod', 'GSM48_BCAP_SV_AMR_OHW', - 'sockaddr_storage', '__PTHREAD_MUTEX_HAVE_PREV', - 'SIG_ATOMIC_MAX', 'IPV6_UNICAST_IF', 'IP_PMTUDISC_OMIT', - '_BITS_BYTESWAP_H', 'MCAST_EXCLUDE', 'IPV6_PMTUDISC_DONT', - 'GSM48_BCAP_SV_HR', 'gsm48_bcap_sig_access', '__dev_t', - 'GSM48_BCAP_ITCAP_FAX_G3', 'IP_RETOPTS', 'u_int8_t', - 'UINT16_MAX', 'GSM48_BCAP_MT_V32', 'SOL_ALG', - '_SS_PADSIZE', 'PF_IEEE802154', '__suseconds_t', - 'SO_TIMESTAMPING_OLD', 'u_long', 'SO_REUSEPORT', - 'MNCC_USERINFO_IND', 'UINT_FAST32_MAX', 'IP_IPSEC_POLICY', - 'gsm_mncc_hello', 'SO_SNDTIMEO_NEW', 'SO_TXTIME', - 'IPV6_PMTUDISC_OMIT', 'SIG_ATOMIC_MIN', 'ushort', - 'SOL_XDP', 'IPV6_PATHMTU', 'gsm_mncc_facility', - 'GSM_MNCC_BCAP_RESERVED', 'PF_NETLINK', 'uintmax_t', - '__INO_T_MATCHES_INO64_T', 'SO_PEERCRED', 'PF_MAX', - 'SO_RCVBUFFORCE', 'IPV6_2292PKTINFO', 'IP_TRANSPARENT', - 'UINT_FAST64_WIDTH', 'SO_SECURITY_AUTHENTICATION', - 'pthread_t', '__rlim_t', 'INT_FAST16_MAX', - 'SO_RCVTIMEO_OLD', '__STATFS_MATCHES_STATFS64', 'SO_NOFCS', - 'IPPROTO_DSTOPTS', 'FIOSETOWN', '__USE_XOPEN2K8XSI', - 'IP_UNBLOCK_SOURCE', 'fsblkcnt64_t', '__intmax_t', - 'uint_least16_t', 'MSG_WAITFORONE', 'SO_SNDLOWAT', - '_SYS_CDEFS_H', 'ip_opts', '__pthread_rwlock_arch_t', - 'MNCC_MODIFY_RSP', '__kernel_uid32_t', 'IPPROTO_ROUTING', - '__SIZEOF_PTHREAD_ATTR_T', 'SO_PROTOCOL', 'SIZE_MAX', - 'caddr_t', 'UINT_LEAST16_MAX', 'SOL_KCM', - 'SO_TIMESTAMP_OLD', 'SO_ATTACH_FILTER', - 'GSM48_BCAP_SA_X28_NDP', '__int_least16_t', - 'UINT_LEAST32_WIDTH', '__uintmax_t', 'SO_INCOMING_CPU', - 'in_addr_t', 'INT_FAST32_MAX', 'SOL_X25', - 'MNCC_F_BEARER_CAP', 'in6_pktinfo', 'IPV6_RTHDR_LOOSE', - 'PF_LLC', 'MCAST_UNBLOCK_SOURCE', 'GSM_TCHH_FRAME', - 'uint32_t', 'gsm48_bcap_ra', 'gsm48_bcap_interm_rate', - '__have_pthread_attr_t', '_STRUCT_TIMESPEC', - 'GSM48_BCAP_SA_X28_DP_UN', 'IPPROTO_MPLS', - '__USE_XOPEN2KXSI', 'gsm_mncc', 'IPV6_LEAVE_ANYCAST', - '__GLIBC_USE_IEC_60559_BFP_EXT', 'MSG_PEEK', - 'MNCC_F_CAUSE', 'SO_ATTACH_BPF', 'pthread_once_t', - 'PF_RDS', 'PF_ATMSVC', '__kernel_ino_t', 'UINT16_WIDTH', - 'timeval', 'MNCC_RETRIEVE_REJ', 'IP_MTU_DISCOVER', - 'mmsghdr', '__uint32_t', 'INADDR_ALLRTRS_GROUP', - '__uint_least16_t', 'IPPROTO_IPIP', 'IPV6_HDRINCL', - 'GSM_TCH_FRAME_AMR', 'GSM48_BCAP_SV_AMR_OFW', - 'GSM48_BCAP_MT_UNDEF', 'IPPORT_EXECSERVER', - 'SO_MAX_PACING_RATE', '_BITS_UINTN_IDENTITY_H', - '__ino64_t', '__u_quad_t', 'IPPROTO_COMP', '__mode_t', - 'IPV6_AUTHHDR', '__u_short', 'loff_t', 'IPPROTO_FRAGMENT', - 'iovec', 'blksize_t', '__kernel_time_t', '__int_least32_t', - 'N16__pthread_cond_s3DOT_5E', 'SO_PEERSEC', - 'gsm_mncc_ssversion', 'u_int32_t', - 'SCM_TIMESTAMPING_OPT_STATS', 'GSM48_BCAP_TR_TR_PREF', - 'MNCC_START_DTMF_REJ', 'GSM48_BCAP_MT_AUTO_1', - 'register_t', '__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64', - '_SYS_SELECT_H', 'MNCC_SOCK_VERSION', 'MCAST_BLOCK_SOURCE', - 'SOL_BLUETOOTH', 'IPPORT_SMTP', '_ISOC95_SOURCE', - 'SO_SNDBUFFORCE', '_ISOC99_SOURCE', '__nlink_t', - 'MCAST_INCLUDE', '__kernel_ssize_t', 'MNCC_SETUP_RSP', - 'SOCK_RAW', 'fd_set', 'PF_PACKET', 'PF_ATMPVC', - 'IPPORT_EFSSERVER', 'gsm_mncc_cause', '__kernel_caddr_t', - '__clock_t_defined', '__pid_t', 'GSM48_BCAP_UR_2400', - 'INADDR_ALLHOSTS_GROUP', '__socket_type', 'IP_PKTOPTIONS', - 'PF_NFC', '__SYSCALL_WORDSIZE', 'gid_t', 'IPPROTO_BEETPH', - '__USE_MISC', 'MSG_CMSG_CLOEXEC', 'MNCC_SOCKET_HELLO', - '__sigset_t_defined', '__kernel_clock_t', 'fsfilcnt64_t', - '__timer_t_defined', 'int64_t', 'IPV6_LEAVE_GROUP', - '__syscall_ulong_t', 'INT32_WIDTH', 'int_least16_t', - 'SO_TIMESTAMPNS_OLD', 'MCAST_MSFILTER', - '__BIT_TYPES_DEFINED__', 'SO_BPF_EXTENSIONS', - 'SO_DETACH_FILTER', '__USE_POSIX', 'GSM48_BCAP_UR_1200_75', - 'SCM_CREDENTIALS', 'SOMAXCONN', 'SO_RXQ_OVFL', 'sockaddr', - 'WCHAR_WIDTH', 'IPPORT_FINGER', 'u_int', 'IPV6_MTU', - '_ISOC2X_SOURCE', 'SO_TIMESTAMP_NEW', 'IP_CHECKSUM', - 'MNCC_F_KEYPAD', '_SS_SIZE', '_BITS_SOCKADDR_H', - 'MNCC_F_REDIRECTING', 'IP_PMTUDISC_WANT', '__kernel_gid_t', - 'GSM48_BCAP_RRQ_DUAL_HR', 'IPV6_ROUTER_ALERT_ISOLATE', - '__kernel_key_t', 'IPPROTO_GRE', 'INADDR_UNSPEC_GROUP', - 'SOL_RAW', '_ISOC11_SOURCE', 'ip_msfilter', - 'IPV6_TRANSPARENT', 'IPV6_2292HOPOPTS', 'uint_least64_t', - 'INT16_MAX', 'MSG_CONFIRM', 'GSM48_BCAP_UR_4800', - 'INADDR_LOOPBACK', '__u_long', '__SIZEOF_PTHREAD_MUTEX_T', - '__USE_UNIX98', 'PF_ASH', 'IPV6_2292HOPLIMIT', - 'IPPORT_BIFFUDP', 'SCM_TIMESTAMPING_PKTINFO', - 'UINT_FAST8_WIDTH', '__uint_least32_t', 'u_int64_t', - 'INADDR_MAX_LOCAL_GROUP', '__daddr_t', 'SOL_IP', - '__uint_least64_t', 'GSM48_BCAP_SV_AMR_FW', - 'IPPORT_TIMESERVER', 'IPPORT_FTP', 'SOCK_PACKET', - 'SO_DOMAIN', 'IPV6_NEXTHOP', '__fsword_t', 'PF_BRIDGE', - 'gsm48_bcap_parity', 'int8_t', 'INT_LEAST32_MIN', - 'IPPORT_SYSTAT', 'gsm_mncc_bridge', 'IPV6_RTHDR_TYPE_0', - 'int_least64_t', 'INADDR_ANY', '_THREAD_MUTEX_INTERNAL_H', - 'UINT_LEAST8_MAX', 'MSG_PROXY', 'MNCC_DISC_REQ', 'MSG_FIN', - '__GLIBC_USE_IEC_60559_TYPES_EXT', '__useconds_t', - 'useconds_t', 'PF_PHONET', 'IPV6_PMTUDISC_WANT', - 'IPV6_ADDR_PREFERENCES', 'GSM_MAX_SSVERSION', - 'MNCC_ALERT_REQ', 'MNCC_START_DTMF_RSP', - 'INET6_ADDRSTRLEN', 'IPV6_JOIN_ANYCAST', - 'IPPORT_LOGINSERVER', 'sigset_t', 'MSG_ZEROCOPY', 'PF_KEY', - 'SO_WIFI_STATUS', 'IP_MULTICAST_TTL', 'IPV6_JOIN_GROUP', - 'IPV6_CHECKSUM', 'INT_FAST32_MIN', 'gsm48_bcap_modem_type', - 'SO_COOKIE', '__kernel_timer_t', '_STDINT_H', - 'IPV6_MULTICAST_ALL', 'GSM48_BCAP_MT_V21', - 'GSM48_BCAP_MT_V22', 'GSM48_BCAP_MT_V23', 'MNCC_SETUP_IND', - '_BITS_ENDIAN_H', 'MNCC_NOTIFY_REQ', 'daddr_t', - 'MNCC_STOP_DTMF_IND', '__SIZEOF_PTHREAD_RWLOCKATTR_T', - '__PDP_ENDIAN', 'SOL_NETLINK', 'IP_NODEFRAG', - 'IPV6_PMTUDISC_INTERFACE', 'PF_IB', '__key_t', 'fsid_t', - '_LARGEFILE64_SOURCE', '__OFF_T_MATCHES_OFF64_T', - 'IPV6_XFRM_POLICY', 'SO_SECURITY_ENCRYPTION_TRANSPORT', - '_SIGSET_NWORDS', 'MNCC_FRAME_RECV', 'MSG_FASTOPEN', - 'intmax_t', 'SIOCSPGRP', 'IPV6_RECVTCLASS', - 'SO_PEERGROUPS', 'IP_MULTICAST_IF', 'int_least32_t', - 'uint_fast32_t', 'INT_LEAST32_WIDTH', 'IPPROTO_PIM', - 'IPPROTO_NONE', '__socklen_t', 'SO_RCVTIMEO_NEW', - 'SO_ATTACH_REUSEPORT_EBPF', '__USE_ISOC11', 'MNCC_F_CCCAP', - '__timeval_defined', '_NETINET_IN_H', - 'GSM48_BCAP_SV_AMR_OH', 'int_least8_t'] + + +# values for enumeration 'gsm_mncc_bcap' +gsm_mncc_bcap__enumvalues = { + 0: 'GSM_MNCC_BCAP_SPEECH', + 1: 'GSM_MNCC_BCAP_UNR_DIG', + 2: 'GSM_MNCC_BCAP_AUDIO', + 3: 'GSM_MNCC_BCAP_FAX_G3', + 5: 'GSM_MNCC_BCAP_OTHER_ITC', + 7: 'GSM_MNCC_BCAP_RESERVED', +} +GSM_MNCC_BCAP_SPEECH = 0 +GSM_MNCC_BCAP_UNR_DIG = 1 +GSM_MNCC_BCAP_AUDIO = 2 +GSM_MNCC_BCAP_FAX_G3 = 3 +GSM_MNCC_BCAP_OTHER_ITC = 5 +GSM_MNCC_BCAP_RESERVED = 7 +gsm_mncc_bcap = ctypes.c_uint32 # enum +class struct_gsm_mncc(Structure): + pass + +class struct_gsm_mncc_clir(Structure): + pass + +struct_gsm_mncc_clir._pack_ = 1 # source:False +struct_gsm_mncc_clir._fields_ = [ + ('sup', ctypes.c_int32), + ('inv', ctypes.c_int32), +] + +struct_gsm_mncc._pack_ = 1 # source:False +struct_gsm_mncc._fields_ = [ + ('msg_type', ctypes.c_uint32), + ('callref', ctypes.c_uint32), + ('fields', ctypes.c_uint32), + ('bearer_cap', struct_gsm_mncc_bearer_cap), + ('called', struct_gsm_mncc_number), + ('calling', struct_gsm_mncc_number), + ('redirecting', struct_gsm_mncc_number), + ('connected', struct_gsm_mncc_number), + ('cause', struct_gsm_mncc_cause), + ('progress', struct_gsm_mncc_progress), + ('useruser', struct_gsm_mncc_useruser), + ('facility', struct_gsm_mncc_facility), + ('cccap', struct_gsm_mncc_cccap), + ('ssversion', struct_gsm_mncc_ssversion), + ('clir', struct_gsm_mncc_clir), + ('signal', ctypes.c_int32), + ('keypad', ctypes.c_int32), + ('more', ctypes.c_int32), + ('notify', ctypes.c_int32), + ('emergency', ctypes.c_int32), + ('imsi', ctypes.c_char * 16), + ('lchan_type', ctypes.c_ubyte), + ('lchan_mode', ctypes.c_ubyte), + ('sdp', ctypes.c_char * 1024), + ('PADDING_0', ctypes.c_ubyte * 2), +] + +class struct_gsm_data_frame(Structure): + pass + +struct_gsm_data_frame._pack_ = 1 # source:False +struct_gsm_data_frame._fields_ = [ + ('msg_type', ctypes.c_uint32), + ('callref', ctypes.c_uint32), + ('data', ctypes.c_ubyte * 0), +] + +class struct_gsm_mncc_hello(Structure): + pass + +struct_gsm_mncc_hello._pack_ = 1 # source:False +struct_gsm_mncc_hello._fields_ = [ + ('msg_type', ctypes.c_uint32), + ('version', ctypes.c_uint32), + ('mncc_size', ctypes.c_uint32), + ('data_frame_size', ctypes.c_uint32), + ('called_offset', ctypes.c_uint32), + ('signal_offset', ctypes.c_uint32), + ('emergency_offset', ctypes.c_uint32), + ('lchan_type_offset', ctypes.c_uint32), +] + +class struct_gsm_mncc_rtp(Structure): + pass + +class struct_sockaddr_storage(Structure): + pass + +struct_sockaddr_storage._pack_ = 1 # source:False +struct_sockaddr_storage._fields_ = [ + ('ss_family', ctypes.c_uint16), + ('__ss_padding', ctypes.c_char * 118), + ('__ss_align', ctypes.c_uint64), +] + +struct_gsm_mncc_rtp._pack_ = 1 # source:False +struct_gsm_mncc_rtp._fields_ = [ + ('msg_type', ctypes.c_uint32), + ('callref', ctypes.c_uint32), + ('addr', struct_sockaddr_storage), + ('payload_type', ctypes.c_uint32), + ('payload_msg_type', ctypes.c_uint32), + ('sdp', ctypes.c_char * 1024), +] + +class struct_gsm_mncc_bridge(Structure): + pass + +struct_gsm_mncc_bridge._pack_ = 1 # source:False +struct_gsm_mncc_bridge._fields_ = [ + ('msg_type', ctypes.c_uint32), + ('callref', ctypes.c_uint32 * 2), +] + +__all__ = \ + ['GSM48_BCAP_CODING_GSM_STD', 'GSM48_BCAP_IR_16k', + 'GSM48_BCAP_IR_8k', 'GSM48_BCAP_ITCAP_3k1_AUDIO', + 'GSM48_BCAP_ITCAP_FAX_G3', 'GSM48_BCAP_ITCAP_OTHER', + 'GSM48_BCAP_ITCAP_RESERVED', 'GSM48_BCAP_ITCAP_SPEECH', + 'GSM48_BCAP_ITCAP_UNR_DIG_INF', 'GSM48_BCAP_MT_AUTO_1', + 'GSM48_BCAP_MT_NONE', 'GSM48_BCAP_MT_UNDEF', 'GSM48_BCAP_MT_V21', + 'GSM48_BCAP_MT_V22', 'GSM48_BCAP_MT_V22bis', 'GSM48_BCAP_MT_V23', + 'GSM48_BCAP_MT_V26ter', 'GSM48_BCAP_MT_V32', + 'GSM48_BCAP_PAR_EVEN', 'GSM48_BCAP_PAR_NONE', + 'GSM48_BCAP_PAR_ODD', 'GSM48_BCAP_PAR_ONE', 'GSM48_BCAP_PAR_ZERO', + 'GSM48_BCAP_RA_NONE', 'GSM48_BCAP_RA_OTHER', + 'GSM48_BCAP_RA_V110_X30', 'GSM48_BCAP_RA_X31', + 'GSM48_BCAP_RRQ_DUAL_FR', 'GSM48_BCAP_RRQ_DUAL_HR', + 'GSM48_BCAP_RRQ_FR_ONLY', 'GSM48_BCAP_SA_I440_I450', + 'GSM48_BCAP_SA_X21', 'GSM48_BCAP_SA_X28_DP_IN', + 'GSM48_BCAP_SA_X28_DP_UN', 'GSM48_BCAP_SA_X28_NDP', + 'GSM48_BCAP_SA_X32', 'GSM48_BCAP_SV_AMR_F', + 'GSM48_BCAP_SV_AMR_FW', 'GSM48_BCAP_SV_AMR_H', + 'GSM48_BCAP_SV_AMR_OFW', 'GSM48_BCAP_SV_AMR_OH', + 'GSM48_BCAP_SV_AMR_OHW', 'GSM48_BCAP_SV_EFR', 'GSM48_BCAP_SV_FR', + 'GSM48_BCAP_SV_HR', 'GSM48_BCAP_TMOD_CIRCUIT', + 'GSM48_BCAP_TMOD_PACKET', 'GSM48_BCAP_TR_RLP', + 'GSM48_BCAP_TR_RLP_PREF', 'GSM48_BCAP_TR_TRANSP', + 'GSM48_BCAP_TR_TR_PREF', 'GSM48_BCAP_UR_1200', + 'GSM48_BCAP_UR_12000', 'GSM48_BCAP_UR_1200_75', + 'GSM48_BCAP_UR_2400', 'GSM48_BCAP_UR_300', 'GSM48_BCAP_UR_4800', + 'GSM48_BCAP_UR_9600', 'GSM_BAD_FRAME', 'GSM_MAX_FACILITY', + 'GSM_MAX_SSVERSION', 'GSM_MAX_USERUSER', 'GSM_MNCC_BCAP_AUDIO', + 'GSM_MNCC_BCAP_FAX_G3', 'GSM_MNCC_BCAP_OTHER_ITC', + 'GSM_MNCC_BCAP_RESERVED', 'GSM_MNCC_BCAP_SPEECH', + 'GSM_MNCC_BCAP_UNR_DIG', 'GSM_TCHF_FRAME', 'GSM_TCHF_FRAME_EFR', + 'GSM_TCHH_FRAME', 'GSM_TCH_FRAME_AMR', 'MNCC_ALERT_IND', + 'MNCC_ALERT_REQ', 'MNCC_BRIDGE', 'MNCC_CALL_CONF_IND', + 'MNCC_CALL_PROC_REQ', 'MNCC_DISC_IND', 'MNCC_DISC_REQ', + 'MNCC_FACILITY_IND', 'MNCC_FACILITY_REQ', 'MNCC_FRAME_DROP', + 'MNCC_FRAME_RECV', 'MNCC_F_BEARER_CAP', 'MNCC_F_CALLED', + 'MNCC_F_CALLING', 'MNCC_F_CAUSE', 'MNCC_F_CCCAP', + 'MNCC_F_CONNECTED', 'MNCC_F_EMERGENCY', 'MNCC_F_FACILITY', + 'MNCC_F_KEYPAD', 'MNCC_F_PROGRESS', 'MNCC_F_REDIRECTING', + 'MNCC_F_SIGNAL', 'MNCC_F_SSVERSION', 'MNCC_F_USERUSER', + 'MNCC_HOLD_CNF', 'MNCC_HOLD_IND', 'MNCC_HOLD_REJ', + 'MNCC_LCHAN_MODIFY', 'MNCC_MODIFY_CNF', 'MNCC_MODIFY_IND', + 'MNCC_MODIFY_REJ', 'MNCC_MODIFY_REQ', 'MNCC_MODIFY_RSP', + 'MNCC_NOTIFY_IND', 'MNCC_NOTIFY_REQ', 'MNCC_PROGRESS_REQ', + 'MNCC_REJ_IND', 'MNCC_REJ_REQ', 'MNCC_REL_CNF', 'MNCC_REL_IND', + 'MNCC_REL_REQ', 'MNCC_RETRIEVE_CNF', 'MNCC_RETRIEVE_IND', + 'MNCC_RETRIEVE_REJ', 'MNCC_RTP_CONNECT', 'MNCC_RTP_CREATE', + 'MNCC_RTP_FREE', 'MNCC_SETUP_CNF', 'MNCC_SETUP_COMPL_IND', + 'MNCC_SETUP_COMPL_REQ', 'MNCC_SETUP_IND', 'MNCC_SETUP_REQ', + 'MNCC_SETUP_RSP', 'MNCC_SOCKET_HELLO', 'MNCC_SOCK_VERSION', + 'MNCC_START_DTMF_IND', 'MNCC_START_DTMF_REJ', + 'MNCC_START_DTMF_RSP', 'MNCC_STOP_DTMF_IND', 'MNCC_STOP_DTMF_RSP', + 'MNCC_USERINFO_IND', 'MNCC_USERINFO_REQ', 'gsm48_bcap_coding', + 'gsm48_bcap_interm_rate', 'gsm48_bcap_itcap', + 'gsm48_bcap_modem_type', 'gsm48_bcap_parity', 'gsm48_bcap_ra', + 'gsm48_bcap_rrq', 'gsm48_bcap_sig_access', + 'gsm48_bcap_speech_ver', 'gsm48_bcap_tmod', 'gsm48_bcap_transp', + 'gsm48_bcap_user_rate', 'gsm_mncc_bcap', 'struct_gsm_data_frame', + 'struct_gsm_mncc', 'struct_gsm_mncc_bearer_cap', + 'struct_gsm_mncc_bearer_cap_data', 'struct_gsm_mncc_bridge', + 'struct_gsm_mncc_cause', 'struct_gsm_mncc_cccap', + 'struct_gsm_mncc_clir', 'struct_gsm_mncc_facility', + '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'] diff --git a/mncc_sock.py b/mncc_sock.py index 9e7b8e9..79e2346 100644 --- a/mncc_sock.py +++ b/mncc_sock.py @@ -17,7 +17,7 @@ class mncc_msg_common: def send(self): - return buffer(self)[:] + return bytes(memoryview(self)) def receive(self, bytes): fit = min(len(bytes), ctypes.sizeof(self)) ctypes.memmove(ctypes.addressof(self), bytes, fit) @@ -31,19 +31,19 @@ mncc.GSM_TCHH_FRAME, mncc.GSM_TCHF_FRAME_EFR, mncc.GSM_TCH_FRAME_AMR, mncc.GSM_BAD_FRAME) -class mncc_msg(mncc.gsm_mncc, mncc_msg_common): +class mncc_msg(mncc.struct_gsm_mncc, mncc_msg_common): def __str__(self): return 'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) def __unicode__(self): return u'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields) -class mncc_hello_msg(mncc.gsm_mncc_hello, mncc_msg_common): +class mncc_hello_msg(mncc.struct_gsm_mncc_hello, mncc_msg_common): def __str__(self): return 'mncc_hello_msg(version=0x%04x)' % (self.version) def __unicode__(self): return u'mncc_hello_msg(version=0x%04x)' % (self.version) -class mncc_data_frame_msg(mncc.gsm_data_frame, mncc_msg_common): +class mncc_data_frame_msg(mncc.struct_gsm_data_frame, mncc_msg_common): def __str__(self): return 'mncc_data_frame(type=0x%04x, codec=%s, callref=%u)' \ % (self.msg_type, self.codec_str(), self.callref) @@ -65,20 +65,20 @@ else: return "(???)" -class mncc_rtp_msg(mncc.gsm_mncc_rtp, mncc_msg_common): +class mncc_rtp_msg(mncc.struct_gsm_mncc_rtp, mncc_msg_common): 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): return u'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port) -class mncc_bridge_msg(mncc.gsm_mncc_bridge, mncc_msg_common): +class mncc_bridge_msg(mncc.struct_gsm_mncc_bridge, mncc_msg_common): def __str__(self): return 'mncc_bridge_msg(%u, %u)' % (self.callref[0], self.callref[1]) def __unicode__(self): return u'mncc_bridge_msg(%u, %u)' % (self.callref[0], self.callref[1]) def mncc_number(number, num_type = 0, num_plan = 0, num_present = 1, num_screen = 0): - return mncc.gsm_mncc_number(number = number, type = num_type, + return mncc.struct_gsm_mncc_number(number = number.encode('utf-8'), type = num_type, plan = num_plan, present = num_present, screen = num_screen) @@ -92,7 +92,7 @@ index = index + 1 speech_types[index] = -1 - return mncc.gsm_mncc_bearer_cap(coding = 0, speech_ctm=0, radio = 1, speech_ver = speech_types, transfer = 0, mode = 0) + return mncc.struct_gsm_mncc_bearer_cap(coding = 0, speech_ctm=0, radio = 1, speech_ver = speech_types, transfer = 0, mode = 0) class MnccSocketBase(object): def send(self, msg): @@ -142,12 +142,12 @@ '(0x%04x vs 0x%04x)\n' % (msg.version, mncc.MNCC_SOCK_VERSION)) # Match expected message sizes / offsets - if (msg.mncc_size < ctypes.sizeof(mncc.gsm_mncc) or - msg.data_frame_size != ctypes.sizeof(mncc.gsm_data_frame) or - msg.called_offset != mncc.gsm_mncc.called.offset or - msg.signal_offset != mncc.gsm_mncc.signal.offset or - msg.emergency_offset != mncc.gsm_mncc.emergency.offset or - msg.lchan_type_offset != mncc.gsm_mncc.lchan_type.offset): + if (msg.mncc_size < ctypes.sizeof(mncc.struct_gsm_mncc) or + msg.data_frame_size != ctypes.sizeof(mncc.struct_gsm_data_frame) or + msg.called_offset != mncc.struct_gsm_mncc.called.offset or + msg.signal_offset != mncc.struct_gsm_mncc.signal.offset or + msg.emergency_offset != mncc.struct_gsm_mncc.emergency.offset or + msg.lchan_type_offset != mncc.struct_gsm_mncc.lchan_type.offset): raise AssertionError('MNCC message alignment mismatch\n') log.info('Received %s' % msg) diff --git a/regen-mncc-py.sh b/regen-mncc-py.sh index a1981b4..08a92f1 100755 --- a/regen-mncc-py.sh +++ b/regen-mncc-py.sh @@ -1,38 +1,6 @@ #/bin/sh -echo This script requires that python-ctypeslib is installed on the system -echo Unfortunately, this package is long unmaintained and only available on Debian8 +echo This script requires that python-ctypeslib2 is installed on the system +echo See https://github.com/trolldbois/ctypeslib echo -# If your distro doesn't provide python-ctypeslib: -# svn co "https://svn.python.org/projects/ctypes/trunk/ctypeslib/" -# cd ctypeslib -# python2 ./setup.py install --prefix /tmp/out -# ln -s h2xml.py /tmp/out/bin/h2xml -# ln -s xml2py.py /tmp/out/bin/xml2py -# export PYTHONPATH="$PYTHONPATH:/tmp/out/lib/python2.7/site-packages" -# export PATH="$PATH:/tmp/out/bin/" -# ./regen-mncc-py.sh -# == Troubleshooting: -# * h2ml: Failing with tracebak OSError Not found: -# One may be missing gccxml. On arch, install gccxml-git from AUR. -# * h2xml failing due to missing gccxml_builtins.h: -# Create empty file /tmp/include/gccxml_builtins.h and pass "-I /tmp/include/" to h2xml. -# * Missing __builtin_bswap16/32/64: -# Copy from /usr/include/bits/byteswap.h defines __bswap_constant_16/32/64 to -# either start of mncc.h itself or /tmp/include/gccxml_builtins.h, and rename -# them as __builtin_bswap16/32/64. - -if [ ! -x `which h2xml` ]; then - echo No h2xml executable found - python-ctypeslib not installed? - exit 1 -fi - -if [ ! -x `which xml2py` ]; then - echo No xml2py executable found - python-ctypeslib not installed? - exit 1 -fi - -set -xe -cp ./mncc.h /tmp/mncc.h -h2xml -I /tmp/include/ ./mncc.h -c -o mncc.xml -xml2py mncc.xml -k dest -v -o mncc.py +clang2py -k ems -o mncc.py mncc.h -- 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: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

3 months, 1 week

1
0
0 0

2024

2023

2022

gerrit-log March 2024