- gerrit-log - lists.osmocom.org

[XS] Change in ...osmo_dia2gsup[master]: osmo_dia2gsup: set sndbuf/recbuf explicitly for SCTP

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/40127?usp=email ) Change subject: osmo_dia2gsup: set sndbuf/recbuf explicitly for SCTP ...................................................................... osmo_dia2gsup: set sndbuf/recbuf explicitly for SCTP When opening an SCTP socket on Linux, Erlang/OTP does set its own default SO_SNDBUF/SO_RCVBUF values if the respective socket options (sndbuf and recbuf) are not given to gen_sctp:open/N explicitly. For some reason, the default RCVBUF size (1024) is much smaller than the default SNDBUF size (65536), and both are well below modern Linux defaults. Such a small RCVBUF size becomes problematic when the remote peer is sending large packets. Let's explicitly set both sndbuf/recbuf parameters to 65536, allowing the user to overwrite this default via the environment parameters. For more details, see https://github.com/erlang/otp/issues/9722. Change-Id: I793f1295ab42bfc548511fc5ffbda9070280745f --- M src/osmo_dia2gsup.erl 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/27/40127/1 diff --git a/src/osmo_dia2gsup.erl b/src/osmo_dia2gsup.erl index 1739360..c8a1d2b 100644 --- a/src/osmo_dia2gsup.erl +++ b/src/osmo_dia2gsup.erl @@ -48,6 +48,7 @@ -define(SERVER, ?MODULE). -define(ENV_DEFAULT_SCTP_NODELAY, true). +-define(ENV_DEFAULT_SCTP_BUFSZ, 65536). % Diameter application definitions @@ -162,7 +163,9 @@ tcfg(Cfg, LAddr, LPort); tcfg(sctp, LAddr, LPort) -> - Cfg = #{sctp_nodelay => get_env(diameter_nodelay, ?ENV_DEFAULT_SCTP_NODELAY)}, + Cfg = #{sctp_nodelay => get_env(diameter_nodelay, ?ENV_DEFAULT_SCTP_NODELAY), + recbuf => get_env(diameter_sctp_recbuf, ?ENV_DEFAULT_SCTP_BUFSZ), + sndbuf => get_env(diameter_sctp_sndbuf, ?ENV_DEFAULT_SCTP_BUFSZ)}, tcfg(Cfg, LAddr, LPort); tcfg(Cfg, LAddr, LPort) when is_map(Cfg) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/40127?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I793f1295ab42bfc548511fc5ffbda9070280745f Gerrit-Change-Number: 40127 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in ...osmo_dia2gsup[master]: osmo_dia2gsup: disable Nagle for TCP/SCTP by default

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/40126?usp=email ) Change subject: osmo_dia2gsup: disable Nagle for TCP/SCTP by default ...................................................................... osmo_dia2gsup: disable Nagle for TCP/SCTP by default Disable the Nagle's algorithm by default in order to reduce latency of the DIAMETER peer. Allow re-enabling it via the environment parameter 'diameter_nodelay' (false enables the Nagle). Change-Id: I1e62cdbcbbdb29a0a98f390b33cf14592079d579 --- M src/osmo_dia2gsup.erl 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/26/40126/1 diff --git a/src/osmo_dia2gsup.erl b/src/osmo_dia2gsup.erl index 98a766c..1739360 100644 --- a/src/osmo_dia2gsup.erl +++ b/src/osmo_dia2gsup.erl @@ -47,6 +47,7 @@ -export([code_change/3, terminate/2]). -define(SERVER, ?MODULE). +-define(ENV_DEFAULT_SCTP_NODELAY, true). % Diameter application definitions @@ -147,9 +148,7 @@ Proto = get_env(diameter_proto, sctp), ConnectTimer = get_env(diameter_connect_timer, 30000), TransOpts = [{transport_module, tmod(Proto)}, - {transport_config, [{ip, parse_addr(LAddr)}, - {port, LPort}, - {reuseaddr, true}]}, + {transport_config, tcfg(Proto, LAddr, LPort)}, {connect_timer, ConnectTimer}], {ok, _} = diameter:add_transport(Name, {listen, TransOpts}), lager:info("Diameter HSS Application started on IP ~s, ~p port ~p~n", @@ -158,6 +157,19 @@ tmod(tcp) -> diameter_tcp; tmod(sctp) -> diameter_sctp. +tcfg(tcp, LAddr, LPort) -> + Cfg = #{nodelay => get_env(diameter_nodelay, ?ENV_DEFAULT_SCTP_NODELAY)}, + tcfg(Cfg, LAddr, LPort); + +tcfg(sctp, LAddr, LPort) -> + Cfg = #{sctp_nodelay => get_env(diameter_nodelay, ?ENV_DEFAULT_SCTP_NODELAY)}, + tcfg(Cfg, LAddr, LPort); + +tcfg(Cfg, LAddr, LPort) when is_map(Cfg) -> + maps:to_list(Cfg#{ip => parse_addr(LAddr), + port => LPort, + reuseaddr => true}). + parse_addr(AddrStr) when is_list(AddrStr) -> {ok, Addr} = inet:parse_address(AddrStr), Addr; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/40126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I1e62cdbcbbdb29a0a98f390b33cf14592079d579 Gerrit-Change-Number: 40126 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-netif[master]: stream: Improve error logging sctp_recvmsg without sctp_sndrcvinfo

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40122?usp=email ) Change subject: stream: Improve error logging sctp_recvmsg without sctp_sndrcvinfo ...................................................................... stream: Improve error logging sctp_recvmsg without sctp_sndrcvinfo Related: OS#6775 Change-Id: I4ef03a2505ca7409d50fd34371ae4ec40bebb40f --- M src/stream.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/22/40122/1 diff --git a/src/stream.c b/src/stream.c index fb15f93..f0902a4 100644 --- a/src/stream.c +++ b/src/stream.c @@ -266,8 +266,11 @@ return ret; } - if (OSMO_UNLIKELY(ret > 0 && !sinfo)) - LOGP(DLINP, LOGL_ERROR, "%s sctp_recvmsg without SNDRCV cmsg?!?\n", log_pfx); + if (OSMO_UNLIKELY(ret > 0 && !sinfo)) { + char buf[512]; + LOGP(DLINP, LOGL_ERROR, "%s sctp_recvmsg without SNDRCV cmsg?!? ret=%d, flags=0x%x, %s\n", + log_pfx, ret, flags, msgb_hexdump_buf(buf, sizeof(buf), msg)); + } return ret; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40122?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4ef03a2505ca7409d50fd34371ae4ec40bebb40f Gerrit-Change-Number: 40122 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-netif[master]: cosmetic: stream: Fix line indentation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40121?usp=email ) Change subject: cosmetic: stream: Fix line indentation ...................................................................... cosmetic: stream: Fix line indentation Change-Id: I8ea52e30ff25851dfb51cbbb6c3da910c0692bd1 --- M src/stream.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/21/40121/1 diff --git a/src/stream.c b/src/stream.c index 5033f4c..fb15f93 100644 --- a/src/stream.c +++ b/src/stream.c @@ -296,7 +296,7 @@ struct cmsghdr *cmsg = NULL; for (cmsg = CMSG_FIRSTHDR((struct msghdr *) msgh); cmsg != NULL; - cmsg = CMSG_NXTHDR((struct msghdr *) msgh, cmsg)) { + cmsg = CMSG_NXTHDR((struct msghdr *) msgh, cmsg)) { if (cmsg->cmsg_level == IPPROTO_SCTP && cmsg->cmsg_type == SCTP_SNDRCV) { sinfo = (const struct sctp_sndrcvinfo *)CMSG_DATA(cmsg); break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I8ea52e30ff25851dfb51cbbb6c3da910c0692bd1 Gerrit-Change-Number: 40121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in ...pyosmocom[master]: osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conve...

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/40117?usp=email ) Change subject: osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conversion ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/40117?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I59f500c925848872a7fa38d6dbf3d6ea72bc3a90 Gerrit-Change-Number: 40117 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Apr 2025 12:11:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

2 months, 2 weeks

1
0
0 0

[XS] Change in pysim[master]: edit_{binary,record}_decoded: Support hex-decode of bytes

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40119?usp=email ) Change subject: edit_{binary,record}_decoded: Support hex-decode of bytes ...................................................................... edit_{binary,record}_decoded: Support hex-decode of bytes We've created + used osmocom.utils.JsonEncoder as an encoder class for json.{dump,dumps} for quite some time. However, we missed to use this decoder class from the edit_{binary,record}_decoded commands in the pySim-shell VTY. Change-Id: I158e028f9920d8085cd20ea022be2437c64ad700 Related: OS#6774 --- M pySim/filesystem.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/19/40119/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 7f350ec..8821380 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -661,7 +661,7 @@ filename = '%s/file' % dirname # write existing data as JSON to file with open(filename, 'w') as text_file: - json.dump(orig_json, text_file, indent=4) + json.dump(orig_json, text_file, indent=4, cls=JsonEncoder) # run a text editor self._cmd.run_editor(filename) with open(filename, 'r') as text_file: @@ -963,7 +963,7 @@ filename = '%s/file' % dirname # write existing data as JSON to file with open(filename, 'w') as text_file: - json.dump(orig_json, text_file, indent=4) + json.dump(orig_json, text_file, indent=4, cls=JsonEncoder) # run a text editor self._cmd.run_editor(filename) with open(filename, 'r') as text_file: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40119?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I158e028f9920d8085cd20ea022be2437c64ad700 Gerrit-Change-Number: 40119 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

2 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: Use osmocom.construct.{Bytes,GreedyBytes} for hexstring input support

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40120?usp=email ) Change subject: Use osmocom.construct.{Bytes,GreedyBytes} for hexstring input support ...................................................................... Use osmocom.construct.{Bytes,GreedyBytes} for hexstring input support The upstream construct.{Bytes,GreedyBytes} only support bytes/bytearray input data for the encoder, while the [newly-created] osmocom.construct.{Bytes,GreedyBytes} support alternatively hex-string input. This is important in the context of encoding construct-based types from JSON, where our osmocom.utils.JsonEncoder will automatically convert any bytes to hex-string, while re-encoding those hex-strings will fail prior to this patch. Change-Id: I1c8df6350c68aa408ec96ff6cd1e405ceb1a4fbb Closes: OS#6774 --- M pySim/apdu/__init__.py M pySim/apdu/ts_31_102.py M pySim/ara_m.py M pySim/cat.py M pySim/global_platform/http.py M pySim/global_platform/scp.py M pySim/gsm_r.py M pySim/iso7816_4.py M pySim/ota.py M pySim/sms.py M pySim/sysmocom_sja2.py M pySim/ts_31_103.py M pySim/ts_31_103_shared.py M requirements.txt M setup.py 15 files changed, 22 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/20/40120/1 diff --git a/pySim/apdu/__init__.py b/pySim/apdu/__init__.py index 4f08113..84ac83a 100644 --- a/pySim/apdu/__init__.py +++ b/pySim/apdu/__init__.py @@ -29,7 +29,7 @@ import typing from typing import List, Dict, Optional from termcolor import colored -from construct import Byte, GreedyBytes +from construct import Byte from construct import Optional as COptional from osmocom.construct import * from osmocom.utils import * diff --git a/pySim/apdu/ts_31_102.py b/pySim/apdu/ts_31_102.py index fea5038..692cdfd 100644 --- a/pySim/apdu/ts_31_102.py +++ b/pySim/apdu/ts_31_102.py @@ -9,7 +9,7 @@ """ from typing import Dict -from construct import BitStruct, Enum, BitsInteger, Int8ub, Bytes, this, Struct, If, Switch, Const +from construct import BitStruct, Enum, BitsInteger, Int8ub, this, Struct, If, Switch, Const from construct import Optional as COptional from osmocom.construct import * diff --git a/pySim/ara_m.py b/pySim/ara_m.py index e10ae10..9079a97 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -26,7 +26,7 @@ # -from construct import GreedyBytes, GreedyString, Struct, Enum, Int8ub, Int16ub +from construct import GreedyString, Struct, Enum, Int8ub, Int16ub from construct import Optional as COptional from osmocom.construct import * from osmocom.tlv import * diff --git a/pySim/cat.py b/pySim/cat.py index 448d874..ae4e06e 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -20,11 +20,11 @@ from typing import List from bidict import bidict -from construct import Int8ub, Int16ub, Byte, Bytes, BitsInteger +from construct import Int8ub, Int16ub, Byte, BitsInteger from construct import Struct, Enum, BitStruct, this -from construct import GreedyBytes, Switch, GreedyRange, FlagsEnum +from construct import Switch, GreedyRange, FlagsEnum from osmocom.tlv import TLV_IE, COMPR_TLV_IE, BER_TLV_IE, TLV_IE_Collection -from osmocom.construct import PlmnAdapter, BcdAdapter, HexAdapter, GsmStringAdapter, TonNpi, GsmString +from osmocom.construct import PlmnAdapter, BcdAdapter, HexAdapter, GsmStringAdapter, TonNpi, GsmString, Bytes, GreedyBytes from osmocom.utils import b2h from pySim.utils import dec_xplmn_w_act diff --git a/pySim/global_platform/http.py b/pySim/global_platform/http.py index dee196d..dbad9ac 100644 --- a/pySim/global_platform/http.py +++ b/pySim/global_platform/http.py @@ -17,9 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from construct import Struct, Int8ub, Int16ub, Bytes, GreedyBytes, GreedyString, BytesInteger +from construct import Struct, Int8ub, Int16ub, GreedyString, BytesInteger from construct import this, len_, Rebuild, Const from construct import Optional as COptional +from osmocom.construct import Bytes, GreedyBytes from osmocom.tlv import BER_TLV_IE from pySim import cat diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index 72aed24..e674766 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -20,8 +20,9 @@ from typing import Optional from Cryptodome.Cipher import DES3, DES from Cryptodome.Util.strxor import strxor -from construct import Struct, Bytes, Int8ub, Int16ub, Const +from construct import Struct, Int8ub, Int16ub, Const from construct import Optional as COptional +from osmocom.construct import Bytes from osmocom.utils import b2h from osmocom.tlv import bertlv_parse_len, bertlv_encode_len from pySim.utils import parse_command_apdu diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index bc54c72..5798df7 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -26,7 +26,7 @@ from pySim.utils import * from struct import pack, unpack -from construct import Struct, Bytes, Int8ub, Int16ub, Int24ub, Int32ub, FlagsEnum +from construct import Struct, Int8ub, Int16ub, Int24ub, Int32ub, FlagsEnum from construct import Optional as COptional from osmocom.construct import * diff --git a/pySim/iso7816_4.py b/pySim/iso7816_4.py index ae0c2c8..e9501aa 100644 --- a/pySim/iso7816_4.py +++ b/pySim/iso7816_4.py @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ -from construct import GreedyBytes, GreedyString +from construct import GreedyString from osmocom.tlv import * from osmocom.construct import * diff --git a/pySim/ota.py b/pySim/ota.py index 2d1c8d1..a6b563d 100644 --- a/pySim/ota.py +++ b/pySim/ota.py @@ -19,7 +19,7 @@ import abc import struct from typing import Optional, Tuple -from construct import Enum, Int8ub, Int16ub, Struct, Bytes, GreedyBytes, BitsInteger, BitStruct +from construct import Enum, Int8ub, Int16ub, Struct, BitsInteger, BitStruct from construct import Flag, Padding, Switch, this, PrefixedArray, GreedyRange from osmocom.construct import * from osmocom.utils import b2h diff --git a/pySim/sms.py b/pySim/sms.py index 7e5acf1..7c22c75 100644 --- a/pySim/sms.py +++ b/pySim/sms.py @@ -20,10 +20,10 @@ import typing import abc from bidict import bidict -from construct import Int8ub, Byte, Bytes, Bit, Flag, BitsInteger +from construct import Int8ub, Byte, Bit, Flag, BitsInteger from construct import Struct, Enum, Tell, BitStruct, this, Padding -from construct import Prefixed, GreedyRange, GreedyBytes -from osmocom.construct import HexAdapter, BcdAdapter, TonNpi +from construct import Prefixed, GreedyRange +from osmocom.construct import HexAdapter, BcdAdapter, TonNpi, Bytes, GreedyBytes from osmocom.utils import Hexstr, h2b, b2h from smpp.pdu import pdu_types, operations diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index c145f0f..438df23 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -18,7 +18,7 @@ """ from struct import unpack -from construct import FlagsEnum, Byte, Struct, Int8ub, Bytes, Mapping, Enum, Padding, BitsInteger +from construct import FlagsEnum, Byte, Struct, Int8ub, Mapping, Enum, Padding, BitsInteger from construct import Bit, this, Int32ub, Int16ub, Nibble, BytesInteger, GreedyRange, Const from construct import Optional as COptional from osmocom.utils import * diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index c0142bc..b281659 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -22,7 +22,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from construct import Struct, Switch, this, Bytes, GreedyString +from construct import Struct, Switch, this, GreedyString from osmocom.utils import * from osmocom.tlv import * from osmocom.construct import * diff --git a/pySim/ts_31_103_shared.py b/pySim/ts_31_103_shared.py index 25f3e97..8c56923 100644 --- a/pySim/ts_31_103_shared.py +++ b/pySim/ts_31_103_shared.py @@ -19,9 +19,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from construct import Struct, Switch, Bytes, GreedyString, GreedyBytes, Int8ub, Prefixed, Enum, Byte +from construct import Struct, Switch, GreedyString, Int8ub, Prefixed, Enum, Byte from osmocom.tlv import BER_TLV_IE, TLV_IE_Collection -from osmocom.construct import HexAdapter, Utf8Adapter +from osmocom.construct import Bytes, HexAdapter, Utf8Adapter, GreedyBytes from pySim.filesystem import * # TS 31.103 Section 4.2.16 diff --git a/requirements.txt b/requirements.txt index 11170da..9749d7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ jsonpath-ng construct>=2.10.70 bidict -pyosmocom>=0.0.8 +pyosmocom>=0.0.9 pyyaml>=5.1 termcolor colorlog diff --git a/setup.py b/setup.py index bf9299c..b33fb67 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ "jsonpath-ng", "construct >= 2.10.70", "bidict", - "pyosmocom >= 0.0.8", + "pyosmocom >= 0.0.9", "pyyaml >= 5.1", "termcolor", "colorlog", -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40120?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1c8df6350c68aa408ec96ff6cd1e405ceb1a4fbb Gerrit-Change-Number: 40120 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

2 months, 2 weeks

1
0
0 0

[S] Change in ...pyosmocom[master]: bump version number to 0.0.9 for construct.{Bytes,GreedyBytes}

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/40118?usp=email ) Change subject: bump version number to 0.0.9 for construct.{Bytes,GreedyBytes} ...................................................................... bump version number to 0.0.9 for construct.{Bytes,GreedyBytes} Change-Id: Id8f9e617482c487f3314118ba3df9c937d501596 --- M debian/changelog M pyproject.toml 2 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/18/40118/1 diff --git a/debian/changelog b/debian/changelog index 4bff797..fd85da2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +pyosmocom (0.0.9) unstable; urgency=medium + + [ Neels Hofmeyr ] + * .gitignore: add vim swap file pattern + + [ Harald Welte ] + * osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conversion + * bump version number to 0.0.9 for construct.{Bytes,GreedyBytes} + + -- Harald Welte <lafore(a)gnumonks.org> Wed, 23 Apr 2025 13:24:35 +0200 + pyosmocom (0.0.8) unstable; urgency=medium * construct: add length steps to StripTrailerAdapter diff --git a/pyproject.toml b/pyproject.toml index 37b54ed..5f8fb39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ [project] name = "pyosmocom" -version = "0.0.8" +version = "0.0.9" dependencies = [ "gsm0338", "construct >= 2.9.51" -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/40118?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: Id8f9e617482c487f3314118ba3df9c937d501596 Gerrit-Change-Number: 40118 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

2 months, 2 weeks

1
0
0 0

[S] Change in ...pyosmocom[master]: osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conve...

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/40117?usp=email ) Change subject: osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conversion ...................................................................... osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conversion This is a convenience version of the Bytes / GreedyBytes construct that accepts not only a bytes/bytearray object, but also a hex-encoded string within the encoder. Related: OS#6774 Change-Id: I59f500c925848872a7fa38d6dbf3d6ea72bc3a90 --- M src/osmocom/construct.py 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/17/40117/1 diff --git a/src/osmocom/construct.py b/src/osmocom/construct.py index 7a2851a..620d3f2 100644 --- a/src/osmocom/construct.py +++ b/src/osmocom/construct.py @@ -10,9 +10,10 @@ # pylint: disable=import-error,no-name-in-module from construct.lib.containers import Container, ListContainer from construct.core import EnumIntegerString -from construct import Adapter, Prefixed, Int8ub, GreedyBytes, Default, Flag, Byte, Construct, Enum -from construct import BitsInteger, BitStruct, Bytes, StreamError, stream_read_entire, stream_write +from construct import Adapter, Prefixed, Int8ub, Default, Flag, Byte, Construct, Enum +from construct import BitsInteger, BitStruct, StreamError, stream_read_entire, stream_write from construct import SizeofError, IntegerError, swapbytes +import construct from construct.core import evaluate from construct.lib import integertypes @@ -33,6 +34,19 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +class Bytes(construct.Bytes): + """Just like construct.Bytes but supporting hex-string input.""" + def _build(self, obj, stream, context, path): + data = h2b(data) if isinstance(obj, str) else obj + return super()._build(data, stream, context, path) + +(a)construct.core.singleton +class GreedyBytes(construct.GreedyBytes.__class__): + """Just like construct.GreedyBytes but supporting hex-string input.""" + def _build(self, obj, stream, context, path): + data = h2b(data) if isinstance(obj, str) else obj + return super()._build(data, stream, context, path) + class HexAdapter(Adapter): """convert a bytes() type to a string of hex nibbles.""" -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/40117?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I59f500c925848872a7fa38d6dbf3d6ea72bc3a90 Gerrit-Change-Number: 40117 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

2 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: start-testsuite: fix passing $TEST to ttcn3_start

by fixeria

fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40116?usp=email ) Change subject: start-testsuite: fix passing $TEST to ttcn3_start ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40116?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic50de8350e20d101417c5689058b64fe6547126f Gerrit-Change-Number: 40116 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Apr 2025 09:35:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log