August 2022 - gerrit-log - lists.osmocom.org

Change in simtrace2[master]: simtrace2-tool: hack: kick the comms by sending a fake message

by James Tavares

James Tavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26864 ) Change subject: simtrace2-tool: hack: kick the comms by sending a fake message ...................................................................... simtrace2-tool: hack: kick the comms by sending a fake message This is a workaround until the root cause of the communications failure between simtrace2-tool and simtrace2 firmware is identified. Additional details provided on simtrace mailing list. Change-Id: I40fa06bee5d8194516497e16597e069124ddf0fb --- M host/include/osmocom/simtrace2/simtrace2_api.h M host/lib/simtrace2_api.c M host/src/simtrace2-tool.c 3 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/64/26864/1 diff --git a/host/include/osmocom/simtrace2/simtrace2_api.h b/host/include/osmocom/simtrace2/simtrace2_api.h index d658d16..3a7e5ae 100644 --- a/host/include/osmocom/simtrace2/simtrace2_api.h +++ b/host/include/osmocom/simtrace2/simtrace2_api.h @@ -44,6 +44,7 @@ int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg, uint8_t msg_class, uint8_t msg_type); +int osmo_st2_generic_do_error_none(struct osmo_st2_cardem_inst *ci); int osmo_st2_cardem_request_card_insert(struct osmo_st2_cardem_inst *ci, bool inserted); int osmo_st2_cardem_request_pb_and_rx(struct osmo_st2_cardem_inst *ci, uint8_t pb, uint8_t le); diff --git a/host/lib/simtrace2_api.c b/host/lib/simtrace2_api.c index 4ad7eb7..beb6de4 100644 --- a/host/lib/simtrace2_api.c +++ b/host/lib/simtrace2_api.c @@ -155,6 +155,24 @@ } /*********************************************************************** + * Generic protocol + ***********************************************************************/ + +/*! \brief Send an empty DO_ERROR message to the simtrace2 board */ +int osmo_st2_generic_do_error_none(struct osmo_st2_cardem_inst *ci) +{ + struct msgb *msg = st_msgb_alloc(); + struct cardemu_usb_msg_error *err; + + LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s\n", __func__); + + err = (struct cardemu_usb_msg_error *) msgb_put(msg, sizeof(*err)); + memset(err, 0, sizeof(*err)); + + return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_GENERIC, SIMTRACE_CMD_DO_ERROR); +} + +/*********************************************************************** * Card Emulation protocol ***********************************************************************/ diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index d92638f..407eac9 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -297,6 +297,10 @@ fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); goto close_exit; } + + // HACK: kick the board with a fake message to get subsequent messages to be accepted + // TODO: figure out the real problem, and remove this + osmo_st2_generic_do_error_none(ci); } if (argc - optind <= 0) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I40fa06bee5d8194516497e16597e069124ddf0fb Gerrit-Change-Number: 26864 Gerrit-PatchSet: 1 Gerrit-Owner: James Tavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

1 year, 5 months

3
5
0 0

Change in libosmo-netif[master]: osmux: Allow specifying extra headroom & tailroom in generated rtp msgb

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29260 ) Change subject: osmux: Allow specifying extra headroom & tailroom in generated rtp msgb ...................................................................... Patch Set 1: Code-Review-2 (1 comment) Patchset: PS1: Don't merge this one yet. I may need to add a msgb_alloc_cb instead of specifying headroom & tailroom, since otherwise after msgb_push()ing the l1sap header i get a lot of misaligned ptr runtime errors. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I632654221826340423e1e97b0f8ed9a2baf6c6c3 Gerrit-Change-Number: 29260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 Aug 2022 18:59:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Drop long time deprecated APIs

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/29256 to look at the new patch set (#2). Change subject: osmux: Drop long time deprecated APIs ...................................................................... osmux: Drop long time deprecated APIs Those APIs where deprecated 4 years ago (end of Aug 2018), and they have been used since around that time. Hence it can be considered safe to drop them, since they only make the whole code more complex to understand. API osmux_xfrm_output_init() is left since openbsc.git is still using it. Related: OS#5987 Change-Id: Icbdd364a8161a8113dbf1406716946f684d0a853 --- M include/osmocom/netif/osmux.h M src/osmux.c 2 files changed, 0 insertions(+), 122 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/56/29256/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Icbdd364a8161a8113dbf1406716946f684d0a853 Gerrit-Change-Number: 29256 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Allow specifying extra headroom & tailroom in generated rtp msgb

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29260 ) Change subject: osmux: Allow specifying extra headroom & tailroom in generated rtp msgb ...................................................................... osmux: Allow specifying extra headroom & tailroom in generated rtp msgb This is useful for users of the API whic need to keep forwarding the msgb to lower layers which may need prepending a new header to the msgb, like osmo-bts with l1sap. Related: OS#5987 Change-Id: I632654221826340423e1e97b0f8ed9a2baf6c6c3 --- M include/osmocom/netif/osmux.h M src/osmux.c 2 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/60/29260/1 diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index 8742797..7b561fe 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -86,6 +86,8 @@ struct llist_head list; void (*tx_cb)(struct msgb *msg, void *data); /* Used defined rtp tx callback */ void *data; /* User defined opaque data structure */ + unsigned int rtp_msgb_headroom; + unsigned int rtp_msgb_tailroom; }; static inline uint8_t *osmux_get_payload(struct osmux_hdr *osmuxh) @@ -112,6 +114,7 @@ void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type) OSMO_DEPRECATED("Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead"); void osmux_xfrm_output_set_rtp_ssrc(struct osmux_out_handle *h, uint32_t rtp_ssrc); void osmux_xfrm_output_set_rtp_pl_type(struct osmux_out_handle *h, uint32_t rtp_payload_type); +void osmux_xfrm_output_set_rtp_msgb_extra_room(struct osmux_out_handle *h, unsigned int headroom, unsigned int tailroom); void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, void (*tx_cb)(struct msgb *msg, void *data), void *data); int osmux_xfrm_output_sched(struct osmux_out_handle *h, struct osmux_hdr *osmuxh); void osmux_xfrm_output_flush(struct osmux_out_handle *h); diff --git a/src/osmux.c b/src/osmux.c index 49cc368..7f0bca3 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -128,10 +128,13 @@ struct amr_hdr *amrh; struct timespec delta = { .tv_sec = 0, .tv_nsec = DELTA_RTP_MSG*1000 }; - out_msg = msgb_alloc(sizeof(struct rtp_hdr) + - sizeof(struct amr_hdr) + - osmo_amr_bytes(osmuxh->amr_ft), - "OSMUX test"); + out_msg = msgb_alloc_headroom(h->rtp_msgb_headroom + + sizeof(struct rtp_hdr) + + sizeof(struct amr_hdr) + + osmo_amr_bytes(osmuxh->amr_ft) + + h->rtp_msgb_tailroom, + h->rtp_msgb_headroom, + "osmux-rtp"); if (out_msg == NULL) return NULL; @@ -934,6 +937,12 @@ h->rtp_payload_type = rtp_payload_type; } +void osmux_xfrm_output_set_rtp_msgb_extra_room(struct osmux_out_handle *h, unsigned int headroom, unsigned int tailroom) +{ + h->rtp_msgb_headroom = headroom; + h->rtp_msgb_tailroom = tailroom; +} + #define SNPRINTF_BUFFER_SIZE(ret, remain, offset) \ if (ret < 0) \ ret = 0; \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I632654221826340423e1e97b0f8ed9a2baf6c6c3 Gerrit-Change-Number: 29260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Use new osmux APIs to let libosmo-netif alloc struct osmux_out...

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29259 to look at the new patch set (#2). Change subject: osmux: Use new osmux APIs to let libosmo-netif alloc struct osmux_out_handle ...................................................................... osmux: Use new osmux APIs to let libosmo-netif alloc struct osmux_out_handle This way we don't need to worry about implementation details (struct size) in the future in case they change (they will). Related: OS#5987 Requires: libosmo-netif.git Change-Id Ie8df581f375c9a183a7af60b431561bda82f6e34 Change-Id: I2d0d8c152b8f1234ddfcd74d6cb04b1818b41510 --- M TODO-RELEASE M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_osmux.c 3 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/59/29259/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d0d8c152b8f1234ddfcd74d6cb04b1818b41510 Gerrit-Change-Number: 29259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Allocate struct osmux_out_handle through API

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/29258 to look at the new patch set (#3). Change subject: osmux: Allocate struct osmux_out_handle through API ...................................................................... osmux: Allocate struct osmux_out_handle through API Until now, the osmux_out_handle was allocated by the client, and passed to the API to initialize it. This makes it really hard to improve the implementation without breaking the ABI. Let's break the ABI now one last time (hopefully) by allocating the struct through an API. With only this change, the already built users (osmo-mgw, openbsc) can still work fine, since there's no change on the struct osmux_out_handle. However, they will somehow break next time the struct is changed until they are ported to the same API (easy to do). Related: OS#5987 Change-Id: Ie8df581f375c9a183a7af60b431561bda82f6e34 --- M TODO-RELEASE M examples/osmux-test-output.c M include/osmocom/netif/osmux.h M src/osmux.c M tests/jibuf/jibuf_tool.c M tests/osmux/osmux_test.c M tests/osmux/osmux_test2.c 7 files changed, 145 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/58/29258/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie8df581f375c9a183a7af60b431561bda82f6e34 Gerrit-Change-Number: 29258 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Allocate struct osmux_out_handle through API

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/29258 to look at the new patch set (#2). Change subject: osmux: Allocate struct osmux_out_handle through API ...................................................................... osmux: Allocate struct osmux_out_handle through API Until now, the osmux_out_handle was allocated by the client, and passed to the API to initialize it. This makes it really hard to improve the implementation without breaking the ABI. Let's break the ABI now one last time (hopefully) by allocating the struct through an API. With only this change, the already built users (osmo-mgw, openbsc) can still work fine, since there's no change on the struct osmux_out_handle. However, they will somehow break next time the struct is changed until they are ported to the same API (easy to do). Related: OS#5987 Change-Id: Ie8df581f375c9a183a7af60b431561bda82f6e34 --- M TODO-RELEASE M examples/osmux-test-output.c M include/osmocom/netif/osmux.h M src/osmux.c M tests/jibuf/jibuf_tool.c M tests/osmux/osmux_test.c M tests/osmux/osmux_test2.c 7 files changed, 145 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/58/29258/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie8df581f375c9a183a7af60b431561bda82f6e34 Gerrit-Change-Number: 29258 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Use new osmux APIs to let libosmo-netif alloc struct osmux_out...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29259 ) Change subject: osmux: Use new osmux APIs to let libosmo-netif alloc struct osmux_out_handle ...................................................................... osmux: Use new osmux APIs to let libosmo-netif alloc struct osmux_out_handle This way we don't need to worry about implementation details (struct size) in the future in case they change (they will). Related: OS#5987 Requires: libosmo-netif.git Change-Id Ie8df581f375c9a183a7af60b431561bda82f6e34 Change-Id: I2d0d8c152b8f1234ddfcd74d6cb04b1818b41510 --- M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_osmux.c 2 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/59/29259/1 diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index 7338027..a08c089 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -84,10 +84,10 @@ bool cid_allocated; /* Allocated Osmux circuit ID for this conn */ uint8_t cid; - /* handle to batch messages */ + /* handle to batch messages, shared (refcounted) among several conns */ struct osmux_in_handle *in; - /* handle to unbatch messages */ - struct osmux_out_handle out; + /* handle to unbatch messages, one allocated and owned per conn */ + struct osmux_out_handle *out; /* statistics */ struct { uint32_t chunks; diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index abc3f0e..5ce850d 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -403,7 +403,7 @@ if (endp_osmux_state_check(conn_src->conn->endp, conn_src, false) == 0) { conn_src->osmux.stats.octets += osmux_chunk_length(msg, rem); conn_src->osmux.stats.chunks++; - osmux_xfrm_output_sched(&conn_src->osmux.out, osmuxh); + osmux_xfrm_output_sched(conn_src->osmux.out, osmuxh); } rem = msg->len; } @@ -494,12 +494,12 @@ return -1; } - osmux_xfrm_output_init2(&conn->osmux.out, - (conn->osmux.cid * rtp_ssrc_winlen) + - (random() % rtp_ssrc_winlen), - conn->end.codec->payload_type); - - osmux_xfrm_output_set_tx_cb(&conn->osmux.out, + conn->osmux.out = osmux_xfrm_output_alloc(osmux); + osmux_xfrm_output_set_rtp_ssrc(conn->osmux.out, + (conn->osmux.cid * rtp_ssrc_winlen) + + (random() % rtp_ssrc_winlen)); + osmux_xfrm_output_set_rtp_pl_type(conn->osmux.out, conn->end.codec->payload_type); + osmux_xfrm_output_set_tx_cb(conn->osmux.out, scheduled_from_osmux_tx_rtp_cb, conn); conn->osmux.state = OSMUX_STATE_ENABLED; @@ -519,8 +519,8 @@ if (conn->osmux.state == OSMUX_STATE_ENABLED) { /* We are closing, we don't need pending RTP packets to be transmitted */ - osmux_xfrm_output_set_tx_cb(&conn->osmux.out, NULL, NULL); - osmux_xfrm_output_flush(&conn->osmux.out); + osmux_xfrm_output_set_tx_cb(conn->osmux.out, NULL, NULL); + TALLOC_FREE(conn->osmux.out); osmux_xfrm_input_close_circuit(conn->osmux.in, conn->osmux.cid); conn->osmux.state = OSMUX_STATE_DISABLED; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I2d0d8c152b8f1234ddfcd74d6cb04b1818b41510 Gerrit-Change-Number: 29259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Allocate struct osmux_out_handle through API

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29258 ) Change subject: osmux: Allocate struct osmux_out_handle through API ...................................................................... osmux: Allocate struct osmux_out_handle through API Until now, the osmux_out_handle was allocated by the client, and passed to the API to initialize it. This makes it really hard to improve the implementation without breaking the ABI. Let's break the ABI now one last time (hopefully) by allocating the struct through an API. With only this change, the already built users (osmo-mgw, openbsc) can still work fine, since there's no change on the struct osmux_out_handle. However, they will somehow break next time the struct is changed until they are ported to the same API (easy to do). Related: OS#5987 Change-Id: Ie8df581f375c9a183a7af60b431561bda82f6e34 --- M TODO-RELEASE M examples/osmux-test-output.c M include/osmocom/netif/osmux.h M src/osmux.c 4 files changed, 50 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/58/29258/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..52a8c49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-netif osmux new osmux_xfrm_output_* APIs diff --git a/examples/osmux-test-output.c b/examples/osmux-test-output.c index d39277b..3f0e5a2 100644 --- a/examples/osmux-test-output.c +++ b/examples/osmux-test-output.c @@ -42,7 +42,7 @@ * This is the output handle for osmux, it stores last RTP sequence and * timestamp that has been used. There should be one per circuit ID. */ -static struct osmux_out_handle h_output; +static struct osmux_out_handle *h_output; static int fd; @@ -107,7 +107,7 @@ msg->len, buf); while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) - osmux_xfrm_output_sched(&h_output, osmuxh); + osmux_xfrm_output_sched(h_output, osmuxh); return 0; } @@ -117,7 +117,7 @@ LOGP(DOSMUX_TEST, LOGL_NOTICE, "closing OSMUX.\n"); osmo_dgram_close(conn); osmo_dgram_destroy(conn); - osmux_xfrm_output_flush(&h_output); + talloc_free(h_output); osmo_rtp_handle_free(rtp); amr_close(); exit(EXIT_SUCCESS); @@ -155,8 +155,10 @@ /* * initialize OSMUX handlers. */ - osmux_xfrm_output_init2(&h_output, random(), 98); - osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, NULL); + h_output = osmux_xfrm_output_alloc(NULL); + osmux_xfrm_output_set_rtp_ssrc(h_output, random()); + osmux_xfrm_output_set_rtp_pl_type(h_output, 98); + osmux_xfrm_output_set_tx_cb(h_output, tx_cb, NULL); /* * initialize datagram server. */ diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index 8d39344..8742797 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -107,8 +107,11 @@ int osmux_xfrm_input(struct osmux_in_handle *h, struct msgb *msg, int ccid); void osmux_xfrm_input_deliver(struct osmux_in_handle *h); -void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc) OSMO_DEPRECATED("Use osmux_xfrm_output_init2() instead"); -void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type); +struct osmux_out_handle *osmux_xfrm_output_alloc(void *ctx); +void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc) OSMO_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) OSMO_DEPRECATED("Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead"); +void osmux_xfrm_output_set_rtp_ssrc(struct osmux_out_handle *h, uint32_t rtp_ssrc); +void osmux_xfrm_output_set_rtp_pl_type(struct osmux_out_handle *h, uint32_t rtp_payload_type); void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, void (*tx_cb)(struct msgb *msg, void *data), void *data); int osmux_xfrm_output_sched(struct osmux_out_handle *h, struct osmux_hdr *osmuxh); void osmux_xfrm_output_flush(struct osmux_out_handle *h); diff --git a/src/osmux.c b/src/osmux.c index 7d26fe8..c9b20aa 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -870,6 +870,33 @@ void *data; }; +static int osmux_xfrm_output_talloc_destructor(struct osmux_out_handle *h) +{ + osmux_xfrm_output_flush(h); + return 0; +} + +/* Returned pointer can be freed with regular talloc_free, queue will be flushed + * and all internal data will be freed. */ +struct osmux_out_handle *osmux_xfrm_output_alloc(void *ctx) +{ + struct osmux_out_handle *h; + + h = talloc_zero(ctx, struct osmux_out_handle); + OSMO_ASSERT(h); + + h->rtp_seq = (uint16_t)random(); + h->rtp_timestamp = (uint32_t)random(); + h->rtp_ssrc = (uint32_t)random(); + h->rtp_payload_type = 98; + INIT_LLIST_HEAD(&h->list); + osmo_timer_setup(&h->timer, osmux_xfrm_output_trigger, h); + + talloc_set_destructor(h, osmux_xfrm_output_talloc_destructor); + return h; +} + +/* 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)); @@ -881,6 +908,7 @@ osmo_timer_setup(&h->timer, osmux_xfrm_output_trigger, h); } +/* 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() */ @@ -903,6 +931,15 @@ h->data = data; } +void osmux_xfrm_output_set_rtp_ssrc(struct osmux_out_handle *h, uint32_t rtp_ssrc) +{ + h->rtp_ssrc = rtp_ssrc; +} +void osmux_xfrm_output_set_rtp_pl_type(struct osmux_out_handle *h, uint32_t rtp_payload_type) +{ + h->rtp_payload_type = rtp_payload_type; +} + #define SNPRINTF_BUFFER_SIZE(ret, remain, offset) \ if (ret < 0) \ ret = 0; \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie8df581f375c9a183a7af60b431561bda82f6e34 Gerrit-Change-Number: 29258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_ou...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29257 ) Change subject: osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_output section ...................................................................... osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_output section Change-Id: I46628d1f712e9c5c56c306e27c34ff45731c0172 --- M src/osmux.c 1 file changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/57/29257/1 diff --git a/src/osmux.c b/src/osmux.c index 990216e..7d26fe8 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -831,22 +831,6 @@ LOGP(DLMUX, LOGL_DEBUG, "initialized osmux input converter\n"); } -/*! \brief Set transmission callback to call when a generated RTP packet is to be transmitted - * \param[in] h the osmux out handle handling a specific CID - * \param[in] osmuxh Buffer pointing to osmux frame header structure and AMR payload - * \return Number of generated RTP packets - * - * This Function sets the callback called by the interal timer set by - * osmux_xfrm_out_sched function. - */ -void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, - void (*tx_cb)(struct msgb *msg, void *data), - void *data) -{ - h->tx_cb = tx_cb; - h->data = data; -} - int osmux_xfrm_input_open_circuit(struct osmux_in_handle *h, int ccid, int dummy) { @@ -903,6 +887,22 @@ osmux_xfrm_output_init2(h, rtp_ssrc, 98); } +/*! \brief Set transmission callback to call when a generated RTP packet is to be transmitted + * \param[in] h the osmux out handle handling a specific CID + * \param[in] osmuxh Buffer pointing to osmux frame header structure and AMR payload + * \return Number of generated RTP packets + * + * This Function sets the callback called by the interal timer set by + * osmux_xfrm_out_sched function. + */ +void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, + void (*tx_cb)(struct msgb *msg, void *data), + void *data) +{ + h->tx_cb = tx_cb; + h->data = data; +} + #define SNPRINTF_BUFFER_SIZE(ret, remain, offset) \ if (ret < 0) \ ret = 0; \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I46628d1f712e9c5c56c306e27c34ff45731c0172 Gerrit-Change-Number: 29257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

Change in libosmo-netif[master]: examples/osmux-test-output: Avoid using deprecated Osmux API

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29255 ) Change subject: examples/osmux-test-output: Avoid using deprecated Osmux API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I408bfc84b9c1740df946fa29191f0e286f5b46e1 Gerrit-Change-Number: 29255 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, 31 Aug 2022 14:47:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Discontinue the use of git://

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29254 ) Change subject: debian-bullseye-titan: Discontinue the use of git:// ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I188a04dd6ecae3c92186d5cbf6cd002ad518efc3 Gerrit-Change-Number: 29254 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 31 Aug 2022 14:46:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Drop long time deprecated APIs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29256 ) Change subject: osmux: Drop long time deprecated APIs ...................................................................... osmux: Drop long time deprecated APIs Those APIs where deprecated 4 years ago (end of Aug 2018), and they have been used since around that time. Hence it can be considered safe to drop them, since they only make the whole code more complex to understand. API osmux_xfrm_output_init() is left since openbsc.git is still using it. Related: OS#5987 Change-Id: Icbdd364a8161a8113dbf1406716946f684d0a853 --- M include/osmocom/netif/osmux.h M src/osmux.c 2 files changed, 0 insertions(+), 116 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/56/29256/1 diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index ff537c0..8d39344 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -110,13 +110,9 @@ void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc) OSMO_DEPRECATED("Use osmux_xfrm_output_init2() instead"); void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type); void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, void (*tx_cb)(struct msgb *msg, void *data), void *data); -int osmux_xfrm_output(struct osmux_hdr *osmuxh, struct osmux_out_handle *h, struct llist_head *list) OSMO_DEPRECATED("Use osmux_xfrm_output_sched() instead"); int osmux_xfrm_output_sched(struct osmux_out_handle *h, struct osmux_hdr *osmuxh); void osmux_xfrm_output_flush(struct osmux_out_handle *h); struct osmux_hdr *osmux_xfrm_output_pull(struct msgb *msg); - -void osmux_tx_sched(struct llist_head *list, void (*tx_cb)(struct msgb *msg, void *data), void *data) OSMO_DEPRECATED("Use osmux_xfrm_output_set_tx_cb() instead"); - /*! @} */ #endif diff --git a/src/osmux.c b/src/osmux.c index c43c3eb..990216e 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -191,46 +191,6 @@ return out_msg; } -int osmux_xfrm_output(struct osmux_hdr *osmuxh, struct osmux_out_handle *h, - struct llist_head *list) -{ - struct msgb *msg; - int i; - - INIT_LLIST_HEAD(list); - - for (i=0; i<osmuxh->ctr+1; i++) { - struct rtp_hdr *rtph; - - msg = osmux_rebuild_rtp(h, osmuxh, - osmux_get_payload(osmuxh) + - i * osmo_amr_bytes(osmuxh->amr_ft), - osmo_amr_bytes(osmuxh->amr_ft), !i); - if (msg == NULL) - continue; - - rtph = osmo_rtp_get_hdr(msg); - if (rtph == NULL) - continue; - -#ifdef DEBUG_MSG - { - char buf[4096]; - - osmo_rtp_snprintf(buf, sizeof(buf), msg); - buf[sizeof(buf)-1] = '\0'; - LOGP(DLMUX, LOGL_DEBUG, "to BTS: %s\n", buf); - } -#endif - llist_add_tail(&msg->list, list); - } - - /* Update last seen seq number: */ - h->osmux_seq_ack = osmuxh->seq; - - return i; -} - static void osmux_xfrm_output_trigger(void *data) { struct osmux_out_handle *h = data; @@ -924,80 +884,8 @@ struct msgb *msg; void (*tx_cb)(struct msgb *msg, void *data); void *data; -#ifdef DEBUG_TIMING - struct timeval start; - struct timeval when; -#endif }; -static void osmux_tx_cb(void *data) -{ - struct osmux_tx_handle *h = data; -#ifdef DEBUG_TIMING - struct timeval now, diff; - - osmo_gettimeofday(&now, NULL); - timersub(&now, &h->start, &diff); - timersub(&diff,&h->when, &diff); - LOGP(DLMUX, LOGL_DEBUG, "we are lagging %lu.%.6lu in scheduled " - "transmissions\n", diff.tv_sec, diff.tv_usec); -#endif - - h->tx_cb(h->msg, h->data); - - talloc_free(h); -} - -static void -osmux_tx(struct msgb *msg, struct timeval *when, - void (*tx_cb)(struct msgb *msg, void *data), void *data) -{ - struct osmux_tx_handle *h; - - h = talloc_zero(osmux_ctx, struct osmux_tx_handle); - if (h == NULL) - return; - - h->msg = msg; - h->tx_cb = tx_cb; - h->data = data; - osmo_timer_setup(&h->timer, osmux_tx_cb, h); - -#ifdef DEBUG_TIMING - osmo_gettimeofday(&h->start, NULL); - h->when.tv_sec = when->tv_sec; - h->when.tv_usec = when->tv_usec; -#endif - /* send it now */ - if (when->tv_sec == 0 && when->tv_usec == 0) { - osmux_tx_cb(h); - return; - } - osmo_timer_schedule(&h->timer, when->tv_sec, when->tv_usec); -} - -void -osmux_tx_sched(struct llist_head *list, - void (*tx_cb)(struct msgb *msg, void *data), void *data) -{ - struct msgb *cur, *tmp; - struct timeval delta = { .tv_sec = 0, .tv_usec = DELTA_RTP_MSG }; - struct timeval when; - - timerclear(&when); - - llist_for_each_entry_safe(cur, tmp, list, list) { - -#ifdef DEBUG_MSG - LOGP(DLMUX, LOGL_DEBUG, "scheduled transmision in %lu.%6lu " - "seconds, msg=%p\n", when.tv_sec, when.tv_usec, cur); -#endif - llist_del(&cur->list); - osmux_tx(cur, &when, tx_cb, data); - timeradd(&when, &delta, &when); - } -} - void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type) { memset(h, 0, sizeof(*h)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Icbdd364a8161a8113dbf1406716946f684d0a853 Gerrit-Change-Number: 29256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

Change in libosmo-netif[master]: examples/osmux-test-output: Avoid using deprecated Osmux API

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29255 ) Change subject: examples/osmux-test-output: Avoid using deprecated Osmux API ...................................................................... examples/osmux-test-output: Avoid using deprecated Osmux API Change-Id: I408bfc84b9c1740df946fa29191f0e286f5b46e1 --- M examples/osmux-test-output.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/55/29255/1 diff --git a/examples/osmux-test-output.c b/examples/osmux-test-output.c index 0ab03a7..d39277b 100644 --- a/examples/osmux-test-output.c +++ b/examples/osmux-test-output.c @@ -155,7 +155,7 @@ /* * initialize OSMUX handlers. */ - osmux_xfrm_output_init(&h_output, random()); + osmux_xfrm_output_init2(&h_output, random(), 98); osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, NULL); /* * initialize datagram server. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I408bfc84b9c1740df946fa29191f0e286f5b46e1 Gerrit-Change-Number: 29255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IPA_Emulation: add TEIs for four VAMOS shadow TRXes

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24410 ) Change subject: IPA_Emulation: add TEIs for four VAMOS shadow TRXes ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24410 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: I7c647603e0f91df0d1cfd2dde29f6ab3ca609a06 Gerrit-Change-Number: 24410 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

1 year, 7 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Discontinue the use of git://

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29254 ) Change subject: debian-bullseye-titan: Discontinue the use of git:// ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I188a04dd6ecae3c92186d5cbf6cd002ad518efc3 Gerrit-Change-Number: 29254 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 31 Aug 2022 11:16:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Discontinue the use of git://

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29254 ) Change subject: debian-bullseye-titan: Discontinue the use of git:// ...................................................................... debian-bullseye-titan: Discontinue the use of git:// Change-Id: I188a04dd6ecae3c92186d5cbf6cd002ad518efc3 --- M debian-bullseye-titan/Dockerfile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/54/29254/1 diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 342cc08..f636003 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -37,7 +37,7 @@ apt-get clean # This is required for obtaining talloc reports from the SUT -RUN pip3 install git+git://git.osmocom.org/python/osmo-python-tests +RUN pip3 install git+https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests # somehow Debian folks updated the gcc version but not titan :/ RUN sed -i 's/^#error/\/\/#error/' /usr/include/titan/cversion.h @@ -57,7 +57,7 @@ git config --global user.name "Dock Er" # clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ +RUN git clone https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks && \ make -j8 -C /osmo-ttcn3-hacks deps ADD https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/raw/branch/master/deps/Mak… /tmp/deps-Makefile RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I188a04dd6ecae3c92186d5cbf6cd002ad518efc3 Gerrit-Change-Number: 29254 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Use gitea, not obsolete cgit

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29253 ) Change subject: debian-bullseye-titan: Use gitea, not obsolete cgit ...................................................................... debian-bullseye-titan: Use gitea, not obsolete cgit When downloading the deps/Makefile, use gitea instead of the obsolete and now defunct cgit deep-link Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Related: OS#5670 --- M debian-bullseye-titan/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved; Verified diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 68c27ee..342cc08 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -59,7 +59,7 @@ # clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ make -j8 -C /osmo-ttcn3-hacks deps -ADD https://git.osmocom.org/osmo-ttcn3-hacks/plain/deps/Makefile /tmp/deps-Makefile +ADD https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/raw/branch/master/deps/Mak… /tmp/deps-Makefile RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ cd /osmo-ttcn3-hacks && \ git pull && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Gerrit-Change-Number: 29253 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Use gitea, not obsolete cgit

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29253 ) Change subject: debian-bullseye-titan: Use gitea, not obsolete cgit ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: worked locally in a 'docker build'. fast-tracking to avoid further build failures -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Gerrit-Change-Number: 29253 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 31 Aug 2022 11:01:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Use gitea, not obsolete cgit

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29253 ) Change subject: debian-bullseye-titan: Use gitea, not obsolete cgit ...................................................................... debian-bullseye-titan: Use gitea, not obsolete cgit When downloading the deps/Makefile, use gitea instead of the obsolete and now defunct cgit deep-link Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Related: OS#5670 --- M debian-bullseye-titan/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/29253/1 diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 68c27ee..342cc08 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -59,7 +59,7 @@ # clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ make -j8 -C /osmo-ttcn3-hacks deps -ADD https://git.osmocom.org/osmo-ttcn3-hacks/plain/deps/Makefile /tmp/deps-Makefile +ADD https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/raw/branch/master/deps/Mak… /tmp/deps-Makefile RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ cd /osmo-ttcn3-hacks && \ git pull && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Gerrit-Change-Number: 29253 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

Change in libosmo-sccp[master]: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD

by pespin

Attention is currently required from: neels, laforge, fixeria, Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 ) Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD ...................................................................... Patch Set 16: (4 comments) File src/sccp_scoc.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/a81464a3_aa110981 PS15, Line 600: if ( > We shouldn't. […] Simply drop it then. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/d28a52f7_7f4401a2 PS15, Line 606: } else > Actually it's better to add them to else according to https://www.kernel. […] "Do not unnecessarily use braces where a single statement will do." So why do you say it's better according to it? https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/cd5f094b_282695b0 PS15, Line 635: LOGP(DLSCCP, LOGL_ERROR, "replacing unsent %u bytes of optional data cache with %s optional data\n", > I think it's error - this situation should not arise normally. AFAIU that's something coming from outside, from a peer, so not really an error of the program itself. Not important though. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/68333f0c_d0c3678f PS15, Line 784: xua_msg_add_sccp_addr(xua, SUA_IEI_DEST_ADDR, &conn->calling_addr); > Similar to the above: the comments are placed to match the fields order in the spec. Then write a new comit "comments are placed to match the fields order in the spec." -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a Gerrit-Change-Number: 29084 Gerrit-PatchSet: 16 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 16:14:53 +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> Comment-In-Reply-To: Max <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in libosmo-sccp[master]: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD

by Max

Attention is currently required from: neels, laforge, pespin, fixeria. Hello Jenkins Builder, neels, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 to look at the new patch set (#16). Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD ...................................................................... SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD The length limit of optional Data parameter is 130 bytes according to ITU-T Rec Q.713 §4.2..§4.5. If we receive CR, CC or RLSD message with bigger data - cache it if necessary and send via separate DT1 message after connection becomes active. While at it, clarify the order of comments in the encoding routine to match the spec. Fixes: OS#5579 Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a --- M src/sccp_scoc.c 1 file changed, 133 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/84/29084/16 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a Gerrit-Change-Number: 29084 Gerrit-PatchSet: 16 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 8 months

1
0
0 0

Change in libosmo-sccp[master]: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD

by Max

Attention is currently required from: neels, laforge, pespin, fixeria. Max has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 ) Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD ...................................................................... Patch Set 15: (8 comments) File src/sccp_scoc.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/4363d4d6_ffda9ece PS15, Line 642: /* optional: importance */ > why is this line removed here? this is non related. The RLC does not have optional importance field. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/b870683f_95186f62 PS15, Line 600: if ( > Ack We shouldn't. Shall I replace it with assert or just drop? https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/6fa8a826_fd35be4a PS15, Line 606: } else > remove curly braces in the if. Actually it's better to add them to else according to https://www.kernel.org/doc/html/latest/process/coding-style.html#placing-br… https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/51617eeb_e7923d15 PS15, Line 630: if (xua_drop_data_check(prim, SCCP_MAX_DATA, "cache overrun")) > ... […] Done https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/f4acfafc_5ad77dad PS15, Line 635: LOGP(DLSCCP, LOGL_ERROR, "replacing unsent %u bytes of optional data cache with %s optional data\n", > NOTICE I think it's error - this situation should not arise normally. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/da5d2afe_a69997e6 PS15, Line 639: msgb_alloc(SCCP_MAX_DATA, "SCCP optional data cache for CR/CC/RLSD"); > Ack Done https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/5d2bd69d_a2630137 PS15, Line 639: msgb_alloc(SCCP_MAX_DATA, "SCCP optional data cache for CR/CC/RLSD"); > Ack Done https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/699f9d67_3b1a53c1 PS15, Line 784: xua_msg_add_sccp_addr(xua, SUA_IEI_DEST_ADDR, &conn->calling_addr); > why is this line removed here? this is non related. Similar to the above: the comments are placed to match the fields order in the spec. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a Gerrit-Change-Number: 29084 Gerrit-PatchSet: 15 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 16:07:09 +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

1 year, 8 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc: Enable OSMUX feature in osmo-bts-omldummy

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29011 ) Change subject: ttcn3-bsc: Enable OSMUX feature in osmo-bts-omldummy ...................................................................... ttcn3-bsc: Enable OSMUX feature in osmo-bts-omldummy This feature is used to indicate to the BSC that the BTS supports Osmux. Requires: libosmocore 18c6a8183f92915e77368ecffb1cbf7f555453a3 Related: SYS#5987 Change-Id: Ia402b7514b636750442d0859d5ebc3fcad67dd9f --- M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh 3 files changed, 13 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index 1fb3541..e686710 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -46,6 +46,10 @@ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,VAMOS" +# Disable until libosmocore release > 1.7.0 +if image_suffix_is_master; then + BTS_FEATURES="${BTS_FEATURES},OSMUX" +fi for i in `seq 0 2`; do echo Starting container with OML for BTS$i diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 3d2b70d..e402b33 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -35,6 +35,11 @@ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION" +# Disable until libosmocore release > 1.7.0 +if image_suffix_is_master; then + BTS_FEATURES="${BTS_FEATURES},OSMUX" +fi + for i in "0 1" "1 1" "2 4"; do set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2 diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 40b3f62..c018046 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -45,6 +45,10 @@ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION" +# Disable until libosmocore release > 1.7.0 +if image_suffix_is_master; then + BTS_FEATURES="${BTS_FEATURES},OSMUX" +fi for i in "0 1" "1 1" "2 4"; do set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia402b7514b636750442d0859d5ebc3fcad67dd9f Gerrit-Change-Number: 29011 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Set working directory in systemd service file

by Max

Max has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29242 ) Change subject: Set working directory in systemd service file ...................................................................... Set working directory in systemd service file By default systemd will execute service with root directory (or home directory for user instance) which might result in attempts to create files in unexpected place. Let's set it to 'osmocom' subdir of state directory (/var/lib for system instance) instead. Fixes: OS#5661 Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 --- M contrib/systemd/osmo-msc.service 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve neels: Looks good to me, but someone else must approve Max: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo-msc.service b/contrib/systemd/osmo-msc.service index 343639c..36849f7 100644 --- a/contrib/systemd/osmo-msc.service +++ b/contrib/systemd/osmo-msc.service @@ -8,6 +8,8 @@ [Service] Type=simple Restart=always +StateDirectory=osmocom +WorkingDirectory=%S/osmocom ExecStart=/usr/bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg RestartSec=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 Gerrit-Change-Number: 29242 Gerrit-PatchSet: 2 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Set working directory in systemd service file

by Max

Attention is currently required from: roh. Max has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29242 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 Gerrit-Change-Number: 29242 Gerrit-PatchSet: 2 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 15:38:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-upf[master]: drop charts/, duplicated from libosmo-pfcp.git

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29211 ) Change subject: drop charts/, duplicated from libosmo-pfcp.git ...................................................................... drop charts/, duplicated from libosmo-pfcp.git When placing libosmo-pfcp in a separate repository, I accidentally duplicated the charts. Since the charts are generally valid for PFCP, libosmo-pfcp is the proper place, not here. Change-Id: I95f11e1525b3bc6b782e5f8aecddea672a104c99 --- M configure.ac M doc/Makefile.am D doc/charts/Makefile.am D doc/charts/pfcp_and_gtp.dot D doc/charts/pfcp_cp_peer_fsm.dot D doc/charts/pfcp_cp_session_fsm.dot D doc/charts/pfcp_heartbeat_fsm.dot D doc/charts/pfcp_overview.dot D doc/charts/pfcp_up_peer_fsm.dot D doc/charts/pfcp_up_session_fsm.dot 10 files changed, 0 insertions(+), 205 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index fd5f3fc..f86c0bc 100644 --- a/configure.ac +++ b/configure.ac @@ -206,7 +206,6 @@ doc/Makefile doc/examples/Makefile doc/manuals/Makefile - doc/charts/Makefile contrib/Makefile contrib/systemd/Makefile Makefile) diff --git a/doc/Makefile.am b/doc/Makefile.am index 66103ba..15f36b7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,4 @@ SUBDIRS = \ examples \ manuals \ - charts \ $(NULL) diff --git a/doc/charts/Makefile.am b/doc/charts/Makefile.am deleted file mode 100644 index af0736d..0000000 --- a/doc/charts/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -msc: \ - $(builddir)/pfcp_msgs.png \ - $(builddir)/pfcp_msgs_gtp.png \ - $(NULL) - -dot: \ - $(builddir)/pfcp_overview.png \ - $(builddir)/pfcp_cp_peer_fsm.png \ - $(builddir)/pfcp_up_peer_fsm.png \ - $(builddir)/pfcp_heartbeat_fsm.png \ - $(builddir)/pfcp_cp_session_fsm.png \ - $(builddir)/pfcp_up_session_fsm.png \ - $(builddir)/pfcp_and_gtp.png \ - $(NULL) - -$(builddir)/%.png: $(srcdir)/%.msc - mscgen -T png -o $@ $< - -$(builddir)/%.png: $(srcdir)/%.dot - dot -Tpng $< > $@ - -.PHONY: poll -poll: - while true; do $(MAKE) msc dot; sleep 1; done diff --git a/doc/charts/pfcp_and_gtp.dot b/doc/charts/pfcp_and_gtp.dot deleted file mode 100644 index 5c160b3..0000000 --- a/doc/charts/pfcp_and_gtp.dot +++ /dev/null @@ -1,20 +0,0 @@ -digraph G { -rankdir=LR -labelloc=t; label="PFCP and GTP" - -SGSN [label="SGSN\n123.44.0.9"] -SGWC [label="SGW-C\n123.44.05"] -subgraph cluster_UPF { - label="OsmoUPF"; - SGWU [label="SGW-U\n123.44.0.6"]; - GTPk [label="kernel GTP\n123.44.0.6"] -} - -SGSN -> SGWC [label="S4\nGTPv2-C"] -SGWC -> SGWU [label="Sxa\nPFCP\nSession Establishment:\n"] -SGSN -> GTPk [label="S4\nGTPv1-U",dir=both] - -MS [label="MS\n192.168.104.176"] -MS -> SGSN [dir=both] - -} diff --git a/doc/charts/pfcp_cp_peer_fsm.dot b/doc/charts/pfcp_cp_peer_fsm.dot deleted file mode 100644 index 101fe07..0000000 --- a/doc/charts/pfcp_cp_peer_fsm.dot +++ /dev/null @@ -1,39 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP CP peer FSM\nControl Plane side, managing association with remote UP peer" - -cp [label="CP function",shape="box"] - -cp -> WAIT_ASSOC_SETUP_RESP [label="cp_peer_associate()"] - -txrx [label="PFCP socket",shape="box"] -WAIT_ASSOC_SETUP_RESP -> txrx [label="tx_assoc_setup_req()",style=dotted] -txrx -> WAIT_ASSOC_SETUP_RESP [label="EV_RX_ASSOC_SETUP_RESP",style=dotted] -WAIT_ASSOC_SETUP_RESP -> ASSOCIATED [label="Assoc Setup Resp"] - -WAIT_ASSOC_SETUP_RESP -> WAIT_ASSOC_SETUP_RESP [label="retry"] - -heartbeat [label="PFCP heartbeat FSM",shape=box3d] -ASSOCIATED -> heartbeat [label="alloc()",style=dotted] -heartbeat -> ASSOCIATED [label="EV_HEARTBEAT_FAILURE",style=dotted] - -txrx2 [label="PFCP socket",shape="box"] -txrx2 -> ASSOCIATED [label="EV_RX_ASSOC_UPDATE_REQ\n3GPP TS 29.244 6.2.7.3.1",style=dotted] -GRACEFUL_RELEASE -> txrx2 [label="tx_assoc_update_resp()",style=dotted] - -cp_session [label="PFCP CP session FSM",shape=box3d] -cp -> ASSOCIATED [label="cp_peer_session_create()",style=dotted] -ASSOCIATED -> cp_session [label="cp_session_create()",style=dotted] -cp -> cp_session [style=invisible,arrowhead=none] - -ASSOCIATED -> GRACEFUL_RELEASE [label="Association Update\nindicating graceful release"] - -cp -> ASSOCIATED [label="cp_peer_release()",style=dotted] -ASSOCIATED -> term [label="cp_peer_release()\nHeartbeat failure"] - -ASSOCIATED -> WAIT_ASSOC_SETUP_RESP [label="Heartbeat failure"] - -GRACEFUL_RELEASE -> term -term [shape="octagon"] - -} diff --git a/doc/charts/pfcp_cp_session_fsm.dot b/doc/charts/pfcp_cp_session_fsm.dot deleted file mode 100644 index 0319608..0000000 --- a/doc/charts/pfcp_cp_session_fsm.dot +++ /dev/null @@ -1,28 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP CP session FSM" - -cp [label="CP function",shape=box] -cp -> WAIT_ESTABLISHMENT_RESP [label="cp_session_create(cp_peer)\niff cp_peer in state ASSOCIATED"] - -txrx [label="PFCP socket",shape=box] - -WAIT_ESTABLISHMENT_RESP -> txrx [label="tx_session_est_req()",style=dotted] -txrx -> WAIT_ESTABLISHMENT_RESP [label="EV_RX_SESSION_EST_RESP",style=dotted] - -WAIT_ESTABLISHMENT_RESP -> ESTABLISHED [label="Est Resp"] - -cp -> ESTABLISHED [label="cp_session_modify()",style=dotted] -ESTABLISHED -> WAIT_MODIFICATION_RESP [label="cp_session_modify()"] -WAIT_MODIFICATION_RESP -> txrx [label="tx_session_mod_req()",style=dotted] -txrx -> WAIT_MODIFICATION_RESP [label="EV_RX_SESSION_MOD_RESP",style=dotted,constraint=false] -WAIT_MODIFICATION_RESP -> ESTABLISHED [label="Mod Resp"] - -cp -> ESTABLISHED [label="cp_session_delete()",style=dotted] -ESTABLISHED -> WAIT_DELETION_RESP [label="cp_session_delete()"] -WAIT_DELETION_RESP -> txrx [label="tx_session_del_req()",style=dotted] -txrx -> WAIT_DELETION_RESP [label="EV_RX_SESSION_DEL_RESP",style=dotted,constraint=false] -WAIT_DELETION_RESP -> term -term [shape="octagon"] - -} diff --git a/doc/charts/pfcp_heartbeat_fsm.dot b/doc/charts/pfcp_heartbeat_fsm.dot deleted file mode 100644 index b5b4584..0000000 --- a/doc/charts/pfcp_heartbeat_fsm.dot +++ /dev/null @@ -1,21 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP heartbeat FSM" - -peer [label="PFCP CP/UP peer FSM",shape=box3d] -txrx [label="PFCP socket",shape=box] - -peer -> IDLE [label="alloc()"] -IDLE -> WAIT_HEARTBEAT_RESP -> IDLE -WAIT_HEARTBEAT_RESP -> term -term [shape="octagon"] - -WAIT_HEARTBEAT_RESP -> txrx [label="tx_heartbeat_req()",style=dotted] -txrx -> WAIT_HEARTBEAT_RESP [label="HEARTBEAT_EV_RX_RESP",style=dotted] - -term -> peer [label="PEER_EV_HEARTBEAT_FAILURE",style=dotted] - -txrx2 [label="PFCP socket",shape=box] -txrx2 -> txrx2 [label="rx Heartbeat Req\ntx Heartbeat Resp",style=dotted] - -} diff --git a/doc/charts/pfcp_overview.dot b/doc/charts/pfcp_overview.dot deleted file mode 100644 index 33fa9a0..0000000 --- a/doc/charts/pfcp_overview.dot +++ /dev/null @@ -1,23 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP Overview\n3GPP TS 29.244 3.1, 5.8.1" - -subgraph cluster_N1_CP { - label="Node: Control Plane function";style=dotted - N1_E_CP [label="CP Entity"] -} - -subgraph cluster_N2_UP { - label="Node: User Plane function\nNode ID: my-userplane.com\n(FQDN may provide multiple PFCP Entities)";style=dotted - N2_E_UP [label="UP Entity\n8.7.6.1"] - N2_E_UP2 [label="UP Entity\n8.7.6.2"] -} - -subgraph cluster_N3_UP { - label="Node: User Plane function\nNode ID: 1.2.3.4\n(IP address means only one PFCP Entity)";style=dotted - N3_E_UP [label="UP Entity\n1.2.3.4\n(osmo-upf)"] -} - -N1_E_CP -> N3_E_UP [label="PFCP Request"] -N1_E_CP -> N2_E_UP -} diff --git a/doc/charts/pfcp_up_peer_fsm.dot b/doc/charts/pfcp_up_peer_fsm.dot deleted file mode 100644 index 60152f7..0000000 --- a/doc/charts/pfcp_up_peer_fsm.dot +++ /dev/null @@ -1,27 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP UP peer FSM\nUser Plane side, managing association with remote CP peer" - -txrx [label="PFCP socket",shape="box"] - -txrx -> NOT_ASSOCIATED [label="rx PFCP msg from\nnew remote IP"] -txrx -> NOT_ASSOCIATED [label="EV_RX_ASSOC_SETUP_REQ",style=dotted] - -NOT_ASSOCIATED -> ASSOCIATED [label="Assoc Setup Req",shape="box"] - -heartbeat [label="PFCP heartbeat FSM",shape=box3d] -ASSOCIATED -> heartbeat [label="alloc()",style=dotted] -heartbeat -> ASSOCIATED [label="EV_HEARTBEAT_FAILURE",style=dotted] - -txrx -> ASSOCIATED [label="EV_RX_SESSION_EST_REQ",style=dotted] -up_session [label="PFCP UP session FSM",shape=box3d] -ASSOCIATED -> up_session [label="up_session_create()",style=dotted] - -txrx -> ASSOCIATED [label="EV_RX_ASSOC_UPD_REQ",style=dotted] -ASSOCIATED -> GRACEFUL_RELEASE [label="Association Update\nindicating graceful release"] - -ASSOCIATED -> term [label="Heartbeat failure"] -GRACEFUL_RELEASE -> term -term [shape="octagon"] - -} diff --git a/doc/charts/pfcp_up_session_fsm.dot b/doc/charts/pfcp_up_session_fsm.dot deleted file mode 100644 index b4a06f5..0000000 --- a/doc/charts/pfcp_up_session_fsm.dot +++ /dev/null @@ -1,21 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP UP session FSM" - -peer [label="PFCP UP peer FSM",shape=box3d] -peer -> ESTABLISHED [label="rx_session_est_req()"] - -txrx [label="PFCP socket",shape="box"] -txrx2 [label="PFCP socket",shape="box"] - -txrx -> ESTABLISHED [label="EV_RX_SESSION_MOD_REQ",style=dotted] -ESTABLISHED -> txrx [label="tx_session_mod_resp()",style=dotted,constraint=false] -ESTABLISHED -> ESTABLISHED [label="Mod"] - -txrx2 -> ESTABLISHED [label="EV_RX_SESSION_DEL_REQ",style=dotted] -ESTABLISHED -> txrx2 [label="tx_session_del_resp()",style=dotted,constraint=false] - -ESTABLISHED -> term [label="Deletion"] -term [shape="octagon"] - -} 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I95f11e1525b3bc6b782e5f8aecddea672a104c99 Gerrit-Change-Number: 29211 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-upf[master]: Allow running without a GTP dev

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29210 ) Change subject: Allow running without a GTP dev ...................................................................... Allow running without a GTP dev Allow running without opening a GTP dev for encapsulation/decapsulation. Probe and open the mnl socket for talking to the GTP kernel module only when actual GTP devices exist in the config. A site that is only doing tunnel proxying via netfilter hence does not require GTP support in the kernel. Change-Id: Ibb79b3ce1906136f77a895ff6f691d72a92c9fb9 --- M include/osmocom/upf/upf_gtp.h M src/osmo-upf/osmo_upf_main.c M src/osmo-upf/upf_gtp.c 3 files changed, 8 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/upf/upf_gtp.h b/include/osmocom/upf/upf_gtp.h index a67c850..1e0df5e 100644 --- a/include/osmocom/upf/upf_gtp.h +++ b/include/osmocom/upf/upf_gtp.h @@ -69,7 +69,7 @@ int upf_gtp_tun_desc_cmp(const struct upf_gtp_tun_desc *a, const struct upf_gtp_tun_desc *b); -int upf_gtp_genl_open(); +int upf_gtp_genl_ensure_open(); void upf_gtp_genl_close(); int upf_gtp_dev_open(const char *name, bool create_gtp_dev, const char *local_addr, bool listen_for_gtpv0, diff --git a/src/osmo-upf/osmo_upf_main.c b/src/osmo-upf/osmo_upf_main.c index b4888af..65a0e84 100644 --- a/src/osmo-upf/osmo_upf_main.c +++ b/src/osmo-upf/osmo_upf_main.c @@ -331,9 +331,6 @@ } } - if (upf_gtp_genl_open()) - return -1; - if (upf_gtp_devs_open()) return -1; diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index 6280e45..d75e8d7 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -183,6 +183,12 @@ dev->sgsn_mode = sgsn_mode; + rc = upf_gtp_genl_ensure_open(); + if (rc) { + LOG_GTP_DEV(dev, LOGL_ERROR, "Cannot set up GTP device, failed to open mnl_socket\n"); + return rc; + } + if (listen_for_gtpv0) { rc = osmo_sock_init_osa_ofd(&dev->gtpv0.ofd, SOCK_DGRAM, 0, &dev->gtpv0.local_addr, &any, OSMO_SOCK_F_BIND); @@ -255,13 +261,8 @@ } /* Open an MNL socket which allows to create and remove GTP devices (requires CAP_NET_ADMIN). */ -int upf_gtp_genl_open() +int upf_gtp_genl_ensure_open() { - if (g_upf->gtp.mockup) { - LOGP(DGTP, LOGL_NOTICE, "gtp/mockup active: not opening mnl_socket\n"); - return 0; - } - /* Already open? */ if (g_upf->gtp.nl && g_upf->gtp.genl_id >= 0) return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ibb79b3ce1906136f77a895ff6f691d72a92c9fb9 Gerrit-Change-Number: 29210 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Set working directory in systemd service file

by neels

Attention is currently required from: roh, Max. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29242 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 Gerrit-Change-Number: 29242 Gerrit-PatchSet: 2 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:19:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-gbproxy[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29252 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5117ab8d7b8542a161f69a9784a9667bda599473 Gerrit-Change-Number: 29252 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:01:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-cbc[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/29251 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/29251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I033029a6b1f2bfa259cec74b139a33b0897fcd98 Gerrit-Change-Number: 29251 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:01:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-upf[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29250 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I786e4a655c35617bbea523275a709e865fc86689 Gerrit-Change-Number: 29250 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:01:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-hnodeb[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/29249 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/29249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I67564759f43193f4739b0b194d5f5da92e3bc6ae Gerrit-Change-Number: 29249 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:01:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-hnbgw[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29246 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3133dc7a687550901841755461db6020ee96d6b1 Gerrit-Change-Number: 29246 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:01:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-sgsn[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/29244 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/29244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I950d84853c6737276d02b3275127b499ae567c38 Gerrit-Change-Number: 29244 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:00:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-mgw[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29245 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7696cd92953787591e7b4777ee79c2671326b972 Gerrit-Change-Number: 29245 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:00:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: update expected-results.xml

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 ) Change subject: bts: update expected-results.xml ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 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: Ifcd8601d1aadce78a1b0a0ed814ae9e77e8497aa Gerrit-Change-Number: 29216 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:00:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: run every day

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29248 ) Change subject: jobs/update-osmo-ci-on-slaves: run every day ...................................................................... jobs/update-osmo-ci-on-slaves: run every day Make sure scripts/osmo-ci-docker-rebuild.sh runs at least once a day on the jenkins nodes, so the docker images are less likely to expire due to being unused. This was the reason for master-osmo-opencm3-projects and gerrit-osmo_dia2gsup failing. Related: https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up Change-Id: If5c4b3cb87100ab6c44d717a17986a4f0c6570fe --- M jobs/update-osmo-ci-on-slaves.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 36ed922..41181cd 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -35,6 +35,7 @@ - pollscm: cron: "H/5 * * * *" ignore-post-commit-hooks: false + - timed: "H H * * *" builders: - shell: './contrib/jenkins.sh' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If5c4b3cb87100ab6c44d717a17986a4f0c6570fe Gerrit-Change-Number: 29248 Gerrit-PatchSet: 1 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-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use jenkins-notifications ML

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29247 ) Change subject: jobs/master-builds: use jenkins-notifications ML ...................................................................... jobs/master-builds: use jenkins-notifications ML I didn't receive mail notifications about failing master-osmo-opencm3-projects jobs. It seems they are not getting through on the gerrit-log mailing list, searching for jenkins gives no results: https://lists.osmocom.org/hyperkitty/search?mlist=gerrit-log%40lists.osmoco… And it seems to be the wrong ML anyway, so change it to jenkins-notifications. Change-Id: I15a747411d928055c71603cd4475289a77c8e749 --- M jobs/master-builds.yml 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 6ca3e24..7fc306f 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -82,7 +82,7 @@ $MAKE $PARALLEL_MAKE; \ $MAKE distcheck' trigger: master-osmo-gmr - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org 246tnt(a)gmail.com + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org 246tnt(a)gmail.com - libosmo-gprs: # Full triggers would be: @@ -241,7 +241,7 @@ git_base_url: https://github.com/no2fpga docker_img: 'registry.osmocom.org/$USER/fpga-build' cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de 246tnt(a)gmail.com + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de 246tnt(a)gmail.com - osmo-fl2k: git_base_url: https://gitea.osmocom.org/sdr @@ -264,7 +264,7 @@ - osmo-gmr: git_base_url: https://gitea.osmocom.org/satellite - email: gerrit-log(a)lists.osmocom.org 246tnt(a)gmail.com + email: jenkins-notifications(a)lists.osmocom.org 246tnt(a)gmail.com - osmo-gsm-manuals: node: 'osmocom-master-debian9' @@ -344,10 +344,10 @@ {docker_img} /build/contrib/jenkins.sh - osmo-sip-connector: - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org holger(a)freyther.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org holger(a)freyther.de - osmo-tetra: - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org 246tnt(a)gmail.com + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org 246tnt(a)gmail.com - osmo-trx: slave_axis: !!python/tuple [osmocom-master-debian9,rpi4-raspbian11] @@ -371,18 +371,18 @@ - osmo-remsim - osmo-asf4-dfu: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de - osmo-ccid-firmware: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de - simtrace2: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - osmo-opencm3-projects: git_base_url: https://gitea.osmocom.org/electronics docker_img: '$USER/debian-bullseye-jenkins' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' - email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - osmo-e1d - osmo-cbc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I15a747411d928055c71603cd4475289a77c8e749 Gerrit-Change-Number: 29247 Gerrit-PatchSet: 1 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-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: run every day

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29248 ) Change subject: jobs/update-osmo-ci-on-slaves: run every day ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If5c4b3cb87100ab6c44d717a17986a4f0c6570fe Gerrit-Change-Number: 29248 Gerrit-PatchSet: 1 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-Comment-Date: Tue, 30 Aug 2022 13:28:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-gbproxy[master]: Set working directory in systemd service file

by Max

Max has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29252 ) Change subject: Set working directory in systemd service file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5117ab8d7b8542a161f69a9784a9667bda599473 Gerrit-Change-Number: 29252 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Aug 2022 13:09:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-cbc[master]: Set working directory in systemd service file

by Max

Max has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/29251 ) Change subject: Set working directory in systemd service file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/29251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I033029a6b1f2bfa259cec74b139a33b0897fcd98 Gerrit-Change-Number: 29251 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Aug 2022 13:04:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use jenkins-notifications ML

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29247 ) Change subject: jobs/master-builds: use jenkins-notifications ML ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I15a747411d928055c71603cd4475289a77c8e749 Gerrit-Change-Number: 29247 Gerrit-PatchSet: 1 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 13:00:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: run every day

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29248 ) Change subject: jobs/update-osmo-ci-on-slaves: run every day ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If5c4b3cb87100ab6c44d717a17986a4f0c6570fe Gerrit-Change-Number: 29248 Gerrit-PatchSet: 1 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 13:00:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-upf[master]: Set working directory in systemd service file

by Max

Max has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29250 ) Change subject: Set working directory in systemd service file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I786e4a655c35617bbea523275a709e865fc86689 Gerrit-Change-Number: 29250 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Aug 2022 12:58:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-bsc[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29243 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5bf2991d8b6507337b864f4d3c43448e54633f37 Gerrit-Change-Number: 29243 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:56:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Set working directory in systemd service file

by pespin

Attention is currently required from: Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29242 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 Gerrit-Change-Number: 29242 Gerrit-PatchSet: 2 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 12:56:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-hnodeb[master]: Set working directory in systemd service file

by Max

Max has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/29249 ) Change subject: Set working directory in systemd service file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/29249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I67564759f43193f4739b0b194d5f5da92e3bc6ae Gerrit-Change-Number: 29249 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Aug 2022 12:56:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-hnbgw[master]: Set working directory in systemd service file

by Max

Max has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29246 ) Change subject: Set working directory in systemd service file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3133dc7a687550901841755461db6020ee96d6b1 Gerrit-Change-Number: 29246 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Aug 2022 12:55:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts

by lynxis lazus

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 ) Change subject: contrib/generate_build_dep.sh: remove erlang bytecode from checkouts ...................................................................... contrib/generate_build_dep.sh: remove erlang bytecode from checkouts The checkout directory should only contains source and no erlang bytecode. Otherwise it might not compile when creating the build_dep.tar.gz on a machine with newer erlang and try to build the package on a system with older erlang. Change-Id: I101119392c6d0fad264c2551fded10288c87da5e --- M contrib/generate_build_dep.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/generate_build_dep.sh b/contrib/generate_build_dep.sh index 2c0dc81..44b7b4d 100755 --- a/contrib/generate_build_dep.sh +++ b/contrib/generate_build_dep.sh @@ -14,4 +14,6 @@ mkdir _checkouts mv ./_build/default/lib/* _checkouts/ mv ./_build/default/plugins/* _checkouts/ +# delete erlang bytecode +find _checkouts/ -iname '*beam' -delete tar czf build_dep.tar.gz ./_checkouts -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/29241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I101119392c6d0fad264c2551fded10288c87da5e Gerrit-Change-Number: 29241 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

2024

2023

2022

gerrit-log August 2022