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

[S] Change in osmo-pcu[master]: encoding: Use defines to set PAYLOAD_TYPE

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email ) Change subject: encoding: Use defines to set PAYLOAD_TYPE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d663cb91672fb383aeb72b223490fa615bdcdf0 Gerrit-Change-Number: 39777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Mar 2025 16:34:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: update redmine to latest 5.1.7 (security update)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/39779?usp=email ) Change subject: update redmine to latest 5.1.7 (security update) ...................................................................... update redmine to latest 5.1.7 (security update) Change-Id: Ia628674900376623626d8ad5f2a97324ed8780a1 --- M redmine/Dockerfile D redmine/changeset_r23408.diff 2 files changed, 1 insertion(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/79/39779/1 diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 19c701b..0fea460 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -1,4 +1,4 @@ -FROM redmine:5.1.5 +FROM redmine:5.1.7 RUN apt-get update && \ apt-get -y upgrade && \ @@ -18,11 +18,6 @@ ADD commitlog-references-oshash-5.1.3.diff /tmp/commitlog-references-oshash-5.1.3.diff RUN cd /usr/src/redmine && patch -p1 < /tmp/commitlog-references-oshash-5.1.3.diff -# https://www.redmine.org/issues/42013 -# https://www.redmine.org/projects/redmine/repository/svn/revisions/23408/dif… -ADD changeset_r23408.diff /tmp/changeset_r23408.diff -RUN cd /usr/src/redmine && patch -p0 < /tmp/changeset_r23408.diff - ADD docker-entrypoint-osmo.sh / ENTRYPOINT ["/docker-entrypoint-osmo.sh"] CMD ["rails", "server", "-b", "0.0.0.0"] diff --git a/redmine/changeset_r23408.diff b/redmine/changeset_r23408.diff deleted file mode 100644 index d466a61..0000000 --- a/redmine/changeset_r23408.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- Gemfile.orig 2025-01-06 10:18:09.938286940 +0000 -+++ Gemfile 2025-01-06 10:18:33.674878971 +0000 -@@ -74,7 +74,7 @@ - if adapters.any? - adapters.each do |adapter| - case adapter.strip -- when 'mysql2' -+ when /mysql2/ - gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] - gem "with_advisory_lock" - when /postgresql/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39779?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia628674900376623626d8ad5f2a97324ed8780a1 Gerrit-Change-Number: 39779 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

3 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: csn1: Use enum to select enc/dec direction

by Jenkins Builder

Attention is currently required from: fixeria. Jenkins Builder has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email ) Change subject: csn1: Use enum to select enc/dec direction ...................................................................... Patch Set 1: (8 comments) File src/csn1.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-22068): https://gerrit.osmocom.org/c/osmo-pcu/+/39778/comment/39e29943_d88de608?usp… : PS1, Line 55: CSN_DIRECTION_ENC = 0, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-22068): https://gerrit.osmocom.org/c/osmo-pcu/+/39778/comment/7c664497_9037d2cf?usp… : PS1, Line 56: CSN_DIRECTION_DEC = 1, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-22068): https://gerrit.osmocom.org/c/osmo-pcu/+/39778/comment/e53ca4d8_aae5661f?usp… : PS1, Line 69: enum CSN_Direction direction; /* encode vs decode */ please, no spaces at the start of a line File src/csn1.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-22068): https://gerrit.osmocom.org/c/osmo-pcu/+/39778/comment/4010936c_7ae1d450?usp… : PS1, Line 76: ar->direction = CSN_DIRECTION_ENC; please, no spaces at the start of a line File src/csn1_dec.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-22068): https://gerrit.osmocom.org/c/osmo-pcu/+/39778/comment/e74ba6c5_65a800c7?usp… : PS1, Line 486: arT.direction = CSN_DIRECTION_DEC; code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-22068): https://gerrit.osmocom.org/c/osmo-pcu/+/39778/comment/166f7c02_d65173f7?usp… : PS1, Line 486: arT.direction = CSN_DIRECTION_DEC; please, no spaces at the start of a line File src/csn1_enc.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-22068): https://gerrit.osmocom.org/c/osmo-pcu/+/39778/comment/57906aec_c82d8f1d?usp… : PS1, Line 436: arT.direction = CSN_DIRECTION_ENC; code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-22068): https://gerrit.osmocom.org/c/osmo-pcu/+/39778/comment/94888fba_3a7fe852?usp… : PS1, Line 436: arT.direction = CSN_DIRECTION_ENC; please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I845bcab61e354436bff1c3a0f2b6f49de9705716 Gerrit-Change-Number: 39778 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Mar 2025 15:42:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

3 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: csn1: Use enum to select enc/dec direction

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email ) Change subject: csn1: Use enum to select enc/dec direction ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: @vyanitskiy@sysmocom.de we probably need a similar patch for libosmo-gprs,git/csn1. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I845bcab61e354436bff1c3a0f2b6f49de9705716 Gerrit-Change-Number: 39778 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Mar 2025 15:42:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

3 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: csn1: Use enum to select enc/dec direction

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email ) Change subject: csn1: Use enum to select enc/dec direction ...................................................................... csn1: Use enum to select enc/dec direction Change-Id: I845bcab61e354436bff1c3a0f2b6f49de9705716 --- M src/csn1.c M src/csn1.h M src/csn1_dec.c M src/csn1_enc.c M src/gsm_rlcmac.c 5 files changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/78/39778/1 diff --git a/src/csn1.c b/src/csn1.c index a9b1343..7148e8c 100644 --- a/src/csn1.c +++ b/src/csn1.c @@ -73,7 +73,7 @@ { ar->remaining_bits_len = remaining_bits_len; ar->bit_offset = bit_offset; - ar->direction = 0; + ar->direction = CSN_DIRECTION_ENC; } static const struct value_string csn1_error_names[] = { diff --git a/src/csn1.h b/src/csn1.h index 47956c3..6607b02 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -51,7 +51,10 @@ #define CSNCBS_REVISION_LIMIT_STOP -20 /* Stop packing/unpacking - revision limit */ #define CSNCBS_NOT_SUPPORTED_IE -21 /* Handling of the unpacked IE is not supported by MS-software */ - +enum CSN_Direction { + CSN_DIRECTION_ENC = 0, + CSN_DIRECTION_DEC = 1, +}; #ifndef ElementsOf #define ElementsOf(array) (sizeof(array) / sizeof(array[0])) @@ -63,7 +66,7 @@ { gint remaining_bits_len; /* IN to an csn stream operation */ gint bit_offset; /* IN/OUT to an csn stream operation */ - gint direction; /* 0 - decode; 1 - encode */ + enum CSN_Direction direction; /* encode vs decode */ } csnStream_t; typedef gint16 (*StreamSerializeFcn_t)(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data); diff --git a/src/csn1_dec.c b/src/csn1_dec.c index f0d07ac..c6ea12b 100644 --- a/src/csn1_dec.c +++ b/src/csn1_dec.c @@ -483,7 +483,7 @@ remaining_bits_len -= length_len; csnStreamInit(&arT, bit_offset, length > 0 ? length : remaining_bits_len); - arT.direction = 1; + arT.direction = CSN_DIRECTION_DEC; LOGPC(DCSN1, LOGL_DEBUG, "offset = %u | ", pDescr->offset); Status = serialize(&arT, vector, readIndex, pvDATA(data, pDescr->offset)); diff --git a/src/csn1_enc.c b/src/csn1_enc.c index e4e5e09..b6ed6c4 100644 --- a/src/csn1_enc.c +++ b/src/csn1_enc.c @@ -433,7 +433,7 @@ *writeIndex += length_len; bit_offset += length_len; remaining_bits_len -= length_len; - arT.direction = 0; + arT.direction = CSN_DIRECTION_ENC; csnStreamInit(&arT, bit_offset, remaining_bits_len); Status = serialize(&arT, vector, writeIndex, pvDATA(data, pDescr->offset)); diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index 79fda90..ecb1e44 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -178,7 +178,7 @@ /*< EGPRS Ack/Nack Description IE >*/ gint16 Egprs_Ack_Nack_Desc_w_len_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(EGPRS_AckNack_Desc_t), vector, readIndex, data); } @@ -798,7 +798,7 @@ #if 0 gint16 Receive_N_PDU_Number_list_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(Receive_N_PDU_Number_t), vector, readIndex, data); } @@ -937,7 +937,7 @@ gint16 Content_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(Content_t), vector, readIndex, data); } @@ -961,7 +961,7 @@ static gint16 Additional_access_technologies_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I845bcab61e354436bff1c3a0f2b6f49de9705716 Gerrit-Change-Number: 39778 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-server: Introduce VTY cmd file-write-queue-max-length

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email ) Change subject: pcap-server: Introduce VTY cmd file-write-queue-max-length ...................................................................... pcap-server: Introduce VTY cmd file-write-queue-max-length This allows dimensioning the write queue used to write msgbs to disk. Related: SYS#7374 Change-Id: I137f13481c03f82d11a2d38ba4fd5691a55535ce --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_pcap_wr_file.c M src/osmo_server_core.c M src/osmo_server_vty.c 4 files changed, 49 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index f97e4ae..12a2cb3 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -45,6 +45,7 @@ struct osmo_pcap_server; +#define PCAP_SERVER_FILE_WRQUEUE_MAX_LEN 1024 #define STATE_INITIAL 0 #define STATE_DATA 1 @@ -83,6 +84,8 @@ char *filename; /* file descriptor of the file we write to */ struct osmo_io_fd *local_iofd; + /* Maximum size of write queue of pcap files being stored on disk: */ + size_t wr_queue_max_length; /* Current write offset of the file we write to (local_fd) */ off_t wr_offset; /* Number of bytes confirmed to be written, <=wr_offset */ @@ -90,6 +93,7 @@ osmo_pcap_wr_file_flush_completed_cb_t flush_completed_cb; }; struct osmo_pcap_wr_file *osmo_pcap_wr_file_alloc(void *ctx, void *data); +void osmo_pcap_wr_file_set_write_queue_max_length(struct osmo_pcap_wr_file *wrf, size_t max_len); void osmo_pcap_wr_file_free(struct osmo_pcap_wr_file *wrf); void osmo_pcap_wr_file_set_flush_completed_cb(struct osmo_pcap_wr_file *wrf, osmo_pcap_wr_file_flush_completed_cb_t flush_completed_cb); int osmo_pcap_wr_file_open(struct osmo_pcap_wr_file *wrf, const char *filename, mode_t mode); @@ -184,6 +188,8 @@ off_t max_size; bool max_size_enabled; int max_snaplen; + /* Maximum size of write queue of pcap files being stored on disk: */ + size_t file_wr_queue_max_length; struct { bool enabled; diff --git a/src/osmo_pcap_wr_file.c b/src/osmo_pcap_wr_file.c index 582caa8..d60c5a7 100644 --- a/src/osmo_pcap_wr_file.c +++ b/src/osmo_pcap_wr_file.c @@ -75,6 +75,7 @@ * list in osmo_pcap_wr_file_is_flushing(): */ INIT_LLIST_HEAD(&wrf->entry); wrf->data = data; + wrf->wr_queue_max_length = PCAP_SERVER_FILE_WRQUEUE_MAX_LEN; wrf->wr_offset = 0; wrf->wr_completed = 0; @@ -96,6 +97,13 @@ wrf->flush_completed_cb = flush_completed_cb; } +void osmo_pcap_wr_file_set_write_queue_max_length(struct osmo_pcap_wr_file *wrf, size_t max_len) +{ + wrf->wr_queue_max_length = max_len; + if (wrf->local_iofd) + osmo_iofd_set_txqueue_max_length(wrf->local_iofd, wrf->wr_queue_max_length); +} + int osmo_pcap_wr_file_open(struct osmo_pcap_wr_file *wrf, const char *filename, mode_t mode) { struct osmo_io_ops ioops = { @@ -117,6 +125,7 @@ &ioops, wrf); if (!wrf->local_iofd) return -EBADFD; + osmo_iofd_set_txqueue_max_length(wrf->local_iofd, wrf->wr_queue_max_length); if (osmo_iofd_register(wrf->local_iofd, -1) < 0) { osmo_iofd_free(wrf->local_iofd); wrf->local_iofd = NULL; diff --git a/src/osmo_server_core.c b/src/osmo_server_core.c index 77d916a..4dc4178 100644 --- a/src/osmo_server_core.c +++ b/src/osmo_server_core.c @@ -349,6 +349,7 @@ conn->wrf = osmo_pcap_wr_file_alloc(conn, conn); osmo_pcap_wr_file_set_flush_completed_cb(conn->wrf, osmo_pcap_wr_file_flush_completed_cb); + osmo_pcap_wr_file_set_write_queue_max_length(conn->wrf, conn->server->file_wr_queue_max_length); rc = osmo_pcap_wr_file_open(conn->wrf, curr_filename, conn->server->permission_mask); talloc_free(curr_filename); if (rc < 0) @@ -578,6 +579,7 @@ psrv->max_size = 1073741824; /* 1024^3, 1GB **/ psrv->max_size_enabled = true; psrv->max_snaplen = DEFAULT_SNAPLEN; + psrv->file_wr_queue_max_length = PCAP_SERVER_FILE_WRQUEUE_MAX_LEN; /* By default rotate daily: */ psrv->rotate_localtime.enabled = true; psrv->rotate_localtime.intv = TIME_INTERVAL_DAY; diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 51448ff..0a86633 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -100,6 +100,7 @@ if (pcap_server->completed_path) vty_out(vty, " completed-path %s%s", pcap_server->completed_path, VTY_NEWLINE); vty_out(vty, " file-permission-mask 0%o%s", pcap_server->permission_mask, VTY_NEWLINE); + vty_out(vty, " file-write-queue-max-length %zu%s", pcap_server->file_wr_queue_max_length, VTY_NEWLINE); if (pcap_server->addr) vty_out(vty, " server ip %s%s", pcap_server->addr, VTY_NEWLINE); if (pcap_server->port > 0) @@ -226,6 +227,36 @@ return CMD_WARNING; } +DEFUN(cfg_server_file_write_queue_max_length, + cfg_server_file_write_queue_max_length_cmd, + "file-write-queue-max-length <0-4294967295>", + "Configure the write-queue used for storing received pcap data to disk\n" + "Maximum amount of packets before dropping starts (default " + OSMO_STRINGIFY_VAL(PCAP_SERVER_FILE_WRQUEUE_MAX_LEN) ")\n") +{ + struct osmo_pcap_conn *conn; + int64_t val; + + + if (osmo_str_to_int64(&val, argv[0], 10, 0, INT64_MAX)) { + vty_out(vty, "%% Error parsing value %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + pcap_server->file_wr_queue_max_length = (size_t)val; + + llist_for_each_entry(conn, &pcap_server->conn, entry) { + if (!conn->wrf) + continue; + osmo_pcap_wr_file_set_write_queue_max_length(conn->wrf, + pcap_server->file_wr_queue_max_length); + /* wrfs in conn->wrf_flushing_list don't need queue size increase + * since anyway they won't get more data enqueued in it. */ + } + + return CMD_SUCCESS; +} + DEFUN(cfg_server_ip, cfg_server_ip_cmd, "server ip A.B.C.D", @@ -696,6 +727,7 @@ install_element(SERVER_NODE, &cfg_server_no_completed_path_cmd); install_element(SERVER_NODE, &cfg_server_completed_path_cmd); install_element(SERVER_NODE, &cfg_server_file_permission_mask_cmd); + install_element(SERVER_NODE, &cfg_server_file_write_queue_max_length_cmd); install_element(SERVER_NODE, &cfg_server_ip_cmd); install_element(SERVER_NODE, &cfg_server_port_cmd); install_element(SERVER_NODE, &cfg_server_no_rotate_localtime_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I137f13481c03f82d11a2d38ba4fd5691a55535ce Gerrit-Change-Number: 39774 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

3 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: encoding: Use defines to set PAYLOAD_TYPE

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email ) Change subject: encoding: Use defines to set PAYLOAD_TYPE ...................................................................... encoding: Use defines to set PAYLOAD_TYPE Change-Id: I3d663cb91672fb383aeb72b223490fa615bdcdf0 --- M src/encoding.cpp M src/gsm_rlcmac.c M src/gsm_rlcmac.h 3 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/77/39777/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 75b9a30..b10b9a3 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -602,7 +602,7 @@ Dynamic_Allocation_t *da; /* RLC/MAC control block without the optional RLC/MAC control header */ - block->PAYLOAD_TYPE = 0x01; // Payload Type + block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // Payload Type block->RRBP = rrbp; // RRBP (e.g. N+13) block->SP = poll; // RRBP field is valid block->USF = 0x00; // Uplink state flag @@ -720,7 +720,7 @@ uint8_t tn; - block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header + block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = rrbp; // 0: N+13 block->SP = poll; // RRBP field is valid block->USF = 0x0; // Uplink state flag @@ -1759,7 +1759,7 @@ uint8_t container_idx, PNCDContainer_t *container) { - block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header + block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = 0; // 0: N+13 block->SP = 0; // RRBP field is not valid block->USF = 0x0; // Uplink state flag @@ -1784,7 +1784,7 @@ uint16_t arfcn, uint8_t bsic, uint8_t container_id) { - block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header + block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = rrbp; // RRBP (e.g. N+13) block->SP = poll; // RRBP field is valid? block->USF = 0x0; // Uplink state flag diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index 931c85c..79fda90 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -36,12 +36,6 @@ #include <arpa/inet.h> #include <gprs_debug.h> -/* Payload type as defined in TS 44.060 / 10.4.7 */ -#define PAYLOAD_TYPE_DATA 0 -#define PAYLOAD_TYPE_CTRL_NO_OPT_OCTET 1 -#define PAYLOAD_TYPE_CTRL_OPT_OCTET 2 -#define PAYLOAD_TYPE_RESERVED 3 - /* CSN1 structures */ /*(not all parts of CSN_DESCR structure are always initialized.)*/ static const diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index c43d418..d34024a 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -48,6 +48,12 @@ typedef guint8 N51_t; typedef guint8 N26_t; +/* Payload type as defined in TS 44.060 / 10.4.7 */ +#define PAYLOAD_TYPE_DATA 0 +#define PAYLOAD_TYPE_CTRL_NO_OPT_OCTET 1 +#define PAYLOAD_TYPE_CTRL_OPT_OCTET 2 +#define PAYLOAD_TYPE_RESERVED 3 + /* Starting Time IE as specified in 04.08 */ typedef struct { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d663cb91672fb383aeb72b223490fa615bdcdf0 Gerrit-Change-Number: 39777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-server: Introduce VTY cmd file-write-queue-max-length

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email ) Change subject: pcap-server: Introduce VTY cmd file-write-queue-max-length ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/osmo_pcap_wr_file.c: https://gerrit.osmocom.org/c/osmo-pcap/+/39774/comment/1dd7abfa_ca80a364?us… : PS1, Line 100: osmo_pcap_wr_file_write_queue_max_length > Maybe add _set for consistency with osmo_pcap_wr_file_set_flush_completed_cb above? […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I137f13481c03f82d11a2d38ba4fd5691a55535ce Gerrit-Change-Number: 39774 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Mar 2025 13:23:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

[L] Change in docker-playground[master]: nplab-{m3ua,sua}-test: Record pcap of all testsuite run

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email ) Change subject: nplab-{m3ua,sua}-test: Record pcap of all testsuite run ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 Gerrit-Change-Number: 39770 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Mar 2025 13:22:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-server: Introduce VTY cmd file-write-queue-max-length

by pespin

Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: pcap-server: Introduce VTY cmd file-write-queue-max-length ...................................................................... pcap-server: Introduce VTY cmd file-write-queue-max-length This allows dimensioning the write queue used to write msgbs to disk. Related: SYS#7374 Change-Id: I137f13481c03f82d11a2d38ba4fd5691a55535ce --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_pcap_wr_file.c M src/osmo_server_core.c M src/osmo_server_vty.c 4 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/74/39774/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I137f13481c03f82d11a2d38ba4fd5691a55535ce Gerrit-Change-Number: 39774 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025