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

Change in dahdi-linux[master]: Revert "Remove support for all but wcb41xp wcb43xp and wcb23xp"

by laforge

Attention is currently required from: roox. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27990 ) Change subject: Revert "Remove support for all but wcb41xp wcb43xp and wcb23xp" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I5a2eddf597c6f5c47922ecafc72c43f3a312f005 Gerrit-Change-Number: 27990 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Sun, 01 May 2022 09:24:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: octoi: only memcpy() if it is present in _octoi_tx_echo()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27988 ) Change subject: octoi: only memcpy() if it is present in _octoi_tx_echo() ...................................................................... octoi: only memcpy() if it is present in _octoi_tx_echo() If the caller specifies zero-length data or a NULL pointer, don't attempt to call memcpy() on that. Change-Id: I5f5ed937643162d6ef6ce0cf2908432c007943c1 --- M src/octoi/octoi_sock.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/octoi/octoi_sock.c b/src/octoi/octoi_sock.c index 4245d80..eac07ee 100644 --- a/src/octoi/octoi_sock.c +++ b/src/octoi/octoi_sock.c @@ -130,7 +130,8 @@ } u; u.echo.seq_nr = htons(seq_nr); - memcpy(u.echo.data, data, data_len); + if (data && data_len) + memcpy(u.echo.data, data, data_len); if (is_req) msgt = E1OIP_MSGT_ECHO_REQ; 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-e1d/+/27988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I5f5ed937643162d6ef6ce0cf2908432c007943c1 Gerrit-Change-Number: 27988 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: octoi: Send ECHO_REQ every 10s and update the related stat_item

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27989 ) Change subject: octoi: Send ECHO_REQ every 10s and update the related stat_item ...................................................................... octoi: Send ECHO_REQ every 10s and update the related stat_item As soon as an OCTOI connection gets into ACTIVE state, send a ECHO_REQ every 10s and compute the RTT at the time of receiving the response. Contrary to the initial idea, the stat item contains the RTT (round trip time) measured in micro-seconds. Changing this is not a problem as so far the RTT was always reported as '0', and 0ms == 0us. Change-Id: Id331319bff1cf6896fee37acc45846a2491ca92d --- M src/octoi/e1oip.c M src/octoi/octoi_clnt_fsm.c M src/octoi/octoi_fsm.c M src/octoi/octoi_fsm.h M src/octoi/octoi_srv_fsm.c 5 files changed, 83 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 608a5e0..19eb3bf 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -66,7 +66,7 @@ }; static const struct osmo_stat_item_desc iline_stat_description[] = { - [LINE_STAT_E1oIP_RTT] = { "e1oip:rtt", "Round Trip Time (in ms)" }, + [LINE_STAT_E1oIP_RTT] = { "e1oip:rtt", "Round Trip Time (in us)" }, [LINE_STAT_E1oIP_E1O_FIFO] = { "e1oip:e1o_fifo_level", "E1 originated FIFO level" }, [LINE_STAT_E1oIP_E1T_FIFO] = { "e1oip:e1t_fifo_level", "E1 terminated FIFO level" }, [LINE_STAT_E1oIP_E1O_TS] = { "e1oip:e1o_ts_active", "E1 timeslots active in E1->IP direction" }, diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c index 441f904..c4117d2 100644 --- a/src/octoi/octoi_clnt_fsm.c +++ b/src/octoi/octoi_clnt_fsm.c @@ -46,6 +46,12 @@ struct osmo_timer_list rx_alive_timer; struct octoi_account *acc; + struct { + struct osmo_timer_list timer; + struct timespec last_tx_ts; + uint16_t last_tx_seq; + } echo_req; + /* fields below are all filled in once received from the remote server side */ struct { char *server_id; @@ -122,6 +128,7 @@ st->peer->tdm_permitted = true; osmo_timer_schedule(&st->rx_alive_timer, 3, 0); + osmo_timer_schedule(&st->echo_req.timer, 10, 0); } static void clnt_st_accepted(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -143,6 +150,7 @@ { struct clnt_state *st = fi->priv; + osmo_timer_del(&st->echo_req.timer); osmo_timer_del(&st->rx_alive_timer); st->peer->tdm_permitted = false; } @@ -210,16 +218,27 @@ { struct clnt_state *st = fi->priv; struct msgb *msg = data; - struct e1oip_echo *echo_req; + struct e1oip_echo *echo_req, *echo_resp; struct e1oip_error_ind *err_ind; + int32_t rtt_us; switch (event) { case OCTOI_EV_RX_ECHO_REQ: echo_req = msgb_l2(msg); + LOGPFSML(fi, LOGL_DEBUG, "Rx OCTOI ECHO_REQ (seq=%u)\n", ntohs(echo_req->seq_nr)); octoi_tx_echo_resp(st->peer, ntohs(echo_req->seq_nr), echo_req->data, msgb_l2len(msg)); break; case OCTOI_EV_RX_ECHO_RESP: - /* FIXME: update state, peer has responded! */ + echo_resp = msgb_l2(msg); + if (ntohs(echo_resp->seq_nr) != st->echo_req.last_tx_seq) { + LOGPFSML(fi, LOGL_NOTICE, "Rx OCTOI ECHO RESP (seq=%u) doesn't match our last " + "request (seq=%u)\n", ntohs(echo_resp->seq_nr), st->echo_req.last_tx_seq); + break; + } + rtt_us = ts_us_ago(&st->echo_req.last_tx_ts); + iline_stat_set(st->peer->iline, LINE_STAT_E1oIP_RTT, rtt_us); + LOGPFSML(fi, LOGL_INFO, "Rx OCTOI ECHO_RESP (seq=%u, rtt=%d)\n", + ntohs(echo_resp->seq_nr), rtt_us); break; case OCTOI_EV_RX_ERROR_IND: err_ind = msgb_l2(msg); @@ -301,6 +320,17 @@ osmo_fsm_inst_state_chg(fi, CLNT_ST_WAIT_RECONNECT, 10, 0); } +static void clnt_echo_req_timer_cb(void *data) +{ + struct osmo_fsm_inst *fi = data; + struct clnt_state *st = fi->priv; + + /* trigger sending of an OCTOI ECHO REQ */ + clock_gettime(CLOCK_MONOTONIC, &st->echo_req.last_tx_ts); + octoi_tx_echo_req(st->peer, ++st->echo_req.last_tx_seq, NULL, 0); + LOGPFSML(fi, LOGL_DEBUG, "Tx OCTOI ECHO_REQ (seq=%u)\n", st->echo_req.last_tx_seq); + osmo_timer_schedule(&st->echo_req.timer, 10, 0); +} /* call-back function for every received OCTOI socket message for given peer */ int octoi_clnt_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg) @@ -345,6 +375,7 @@ st->service = E1OIP_SERVICE_E1_FRAMED; st->capability_flags = 0; osmo_timer_setup(&st->rx_alive_timer, clnt_rx_alive_timer_cb, fi); + osmo_timer_setup(&st->echo_req.timer, clnt_echo_req_timer_cb, fi); fi->priv = st; peer->priv = fi; diff --git a/src/octoi/octoi_fsm.c b/src/octoi/octoi_fsm.c index 37d0259..39790fa 100644 --- a/src/octoi/octoi_fsm.c +++ b/src/octoi/octoi_fsm.c @@ -28,6 +28,19 @@ #include "octoi_fsm.h" #include "e1oip.h" +/* how many microseconds ago was 'old_ts'? */ +int32_t ts_us_ago(const struct timespec *old_ts) +{ + struct timespec ts_now, ts_diff; + + clock_gettime(CLOCK_MONOTONIC, &ts_now); + timespecsub(&ts_now, old_ts, &ts_diff); + + if (ts_diff.tv_sec > INT32_MAX / 1000000) + return INT32_MAX; + + return ts_diff.tv_sec * 1000000 + ts_diff.tv_nsec / 1000; +} const struct value_string octoi_fsm_event_names[] = { { OCTOI_EV_RX_TDM_DATA, "RX_TDM_DATA" }, diff --git a/src/octoi/octoi_fsm.h b/src/octoi/octoi_fsm.h index b605c3a..e54afe1 100644 --- a/src/octoi/octoi_fsm.h +++ b/src/octoi/octoi_fsm.h @@ -29,3 +29,5 @@ /* call-back function for every received OCTOI socket message for given peer */ int octoi_srv_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg); int octoi_clnt_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg); + +int32_t ts_us_ago(const struct timespec *old_ts); diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index 53b79e7..1af3805 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -55,6 +55,11 @@ struct octoi_account *acc; void *app_priv; /* application private data */ const char *rej_str; + struct { + struct osmo_timer_list timer; + struct timespec last_tx_ts; + uint16_t last_tx_seq; + } echo_req; }; static void srv_st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -175,6 +180,7 @@ st->peer->tdm_permitted = true; osmo_timer_schedule(&st->rx_alive_timer, 3, 0); + osmo_timer_schedule(&st->echo_req.timer, 10, 0); } static void srv_st_accepted(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -200,6 +206,7 @@ { struct srv_state *st = fi->priv; + osmo_timer_del(&st->echo_req.timer); osmo_timer_del(&st->rx_alive_timer); st->peer->tdm_permitted = false; } @@ -277,16 +284,27 @@ { struct srv_state *st = fi->priv; struct msgb *msg = data; - struct e1oip_echo *echo_req; + struct e1oip_echo *echo_req, *echo_resp; struct e1oip_error_ind *err_ind; + int32_t rtt_us; switch (event) { case OCTOI_EV_RX_ECHO_REQ: echo_req = msgb_l2(msg); + LOGPFSML(fi, LOGL_DEBUG, "Rx OCTOI ECHO_REQ (seq=%u)\n", ntohs(echo_req->seq_nr)); octoi_tx_echo_resp(st->peer, ntohs(echo_req->seq_nr), echo_req->data, msgb_l2len(msg)); break; case OCTOI_EV_RX_ECHO_RESP: - /* TODO: update state, peer has responded! */ + echo_resp = msgb_l2(msg); + if (ntohs(echo_resp->seq_nr) != st->echo_req.last_tx_seq) { + LOGPFSML(fi, LOGL_NOTICE, "Rx OCTOI ECHO RESP (seq=%u) doesn't match our last " + "request (seq=%u)\n", ntohs(echo_resp->seq_nr), st->echo_req.last_tx_seq); + break; + } + rtt_us = ts_us_ago(&st->echo_req.last_tx_ts); + iline_stat_set(st->peer->iline, LINE_STAT_E1oIP_RTT, rtt_us); + LOGPFSML(fi, LOGL_INFO, "Rx OCTOI ECHO_RESP (seq=%u, rtt=%d)\n", + ntohs(echo_resp->seq_nr), rtt_us); break; case OCTOI_EV_RX_ERROR_IND: err_ind = msgb_l2(msg); @@ -316,6 +334,7 @@ struct srv_state *st = fi->priv; osmo_timer_del(&st->rx_alive_timer); + osmo_timer_del(&st->echo_req.timer); /* as long as 'fi' lives within 'peer' we cannot recursively destroy peer */ talloc_steal(OTC_SELECT, fi); @@ -377,6 +396,18 @@ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); } +static void srv_echo_req_timer_cb(void *data) +{ + struct osmo_fsm_inst *fi = data; + struct srv_state *st = fi->priv; + + /* trigger sending of an OCTOI ECHO REQ */ + clock_gettime(CLOCK_MONOTONIC, &st->echo_req.last_tx_ts); + octoi_tx_echo_req(st->peer, ++st->echo_req.last_tx_seq, NULL, 0); + LOGPFSML(fi, LOGL_DEBUG, "Tx OCTOI ECHO_REQ (seq=%u)\n", st->echo_req.last_tx_seq); + osmo_timer_schedule(&st->echo_req.timer, 10, 0); +} + /* call-back function for every received OCTOI socket message for given peer */ int octoi_srv_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg) { @@ -393,6 +424,7 @@ OSMO_ASSERT(st); st->peer = peer; osmo_timer_setup(&st->rx_alive_timer, srv_rx_alive_timer_cb, fi); + osmo_timer_setup(&st->echo_req.timer, srv_echo_req_timer_cb, fi); fi->priv = st; peer->priv = fi; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id331319bff1cf6896fee37acc45846a2491ca92d Gerrit-Change-Number: 27989 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: e1oip: fix line counter descriptions

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27898 ) Change subject: e1oip: fix line counter descriptions ...................................................................... e1oip: fix line counter descriptions The direction is wrong in two counter descriptions Change-Id: Ia294af4b30eec1b32c4b15892751d360608c8333 --- M src/octoi/e1oip.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 87457db..cd07178 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -46,8 +46,8 @@ static const struct rate_ctr_desc iline_ctr_description[] = { [LINE_CTR_E1oIP_UNDERRUN] = { "e1oip:underrun", "Frames underrun / slipped in IP->E1 direction"}, [LINE_CTR_E1oIP_SUBSTITUTED] = { "e1oip:substituted", "Frames substituted in E1->IP direction"}, - [LINE_CTR_E1oIP_E1T_OVERFLOW] = { "e1oip:e1t_overflow", "Frames overflowing the RIFO in E1->IP direction"}, - [LINE_CTR_E1oIP_E1O_OVERFLOW] = { "e1oip:e1o_overflow", "Frames overflowed in IP->E1 direction"}, + [LINE_CTR_E1oIP_E1T_OVERFLOW] = { "e1oip:e1t_overflow", "Frames overflowing the RIFO in IP->E1 direction"}, + [LINE_CTR_E1oIP_E1O_OVERFLOW] = { "e1oip:e1o_overflow", "Frames overflowed in E1->IP direction"}, [LINE_CTR_E1oIP_RX_OUT_OF_ORDER] = { "e1oip:rx:pkt_out_of_order", "Packets out-of-order in IP->E1 direction"}, [LINE_CTR_E1oIP_RX_OUT_OF_WIN] = { "e1oip:rx:pkt_out_of_win", "Packets out-of-rx-window in IP->E1 direction"}, [LINE_CTR_E1oIP_CONNECT_ACCEPT] = { "e1oip:connect_accepted", "OCTOI connections entering accepted state" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia294af4b30eec1b32c4b15892751d360608c8333 Gerrit-Change-Number: 27898 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: e1oip: Add rate_ctr for rx + tx packet / byte count

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27899 ) Change subject: e1oip: Add rate_ctr for rx + tx packet / byte count ...................................................................... e1oip: Add rate_ctr for rx + tx packet / byte count This allows to monitor the traffic utilization of each e1oip line. Change-Id: Ifde6be0b7d3c5767b684cb8fbbc58bbd5cfb0714 --- M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi_fsm.c M src/octoi/octoi_sock.c M src/octoi/octoi_sock.h 5 files changed, 63 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index cd07178..608a5e0 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -51,6 +51,10 @@ [LINE_CTR_E1oIP_RX_OUT_OF_ORDER] = { "e1oip:rx:pkt_out_of_order", "Packets out-of-order in IP->E1 direction"}, [LINE_CTR_E1oIP_RX_OUT_OF_WIN] = { "e1oip:rx:pkt_out_of_win", "Packets out-of-rx-window in IP->E1 direction"}, [LINE_CTR_E1oIP_CONNECT_ACCEPT] = { "e1oip:connect_accepted", "OCTOI connections entering accepted state" }, + [LINE_CTR_E1oIP_RX_BYTES] = { "e1oip:rx:bytes", "Number of bytes received including UDP+IP header" }, + [LINE_CTR_E1oIP_RX_PACKETS] = { "e1oip:rx:packets", "Number of UDP packets received" }, + [LINE_CTR_E1oIP_TX_BYTES] = { "e1oip:tx:bytes", "Number of bytes transmitted including UDP+IP header" }, + [LINE_CTR_E1oIP_TX_PACKETS] = { "e1oip:tx:packets", "Number of UDP packets transmitted" }, }; static const struct rate_ctr_group_desc iline_ctrg_desc = { @@ -82,6 +86,7 @@ static void fifo_threshold_cb(struct frame_fifo *fifo, unsigned int frames, void *priv) { struct e1oip_line *iline = priv; + struct octoi_peer *peer = iline->peer; struct msgb *msg; struct e1oip_tdm_hdr *eith; unsigned int n_frames = fifo->threshold; @@ -108,7 +113,7 @@ /* this situation cannot really happen: The FIFO called us that * a certain threshold is reached, but now it cannot provide * frames? */ - LOGPEER(iline->peer, LOGL_ERROR, + LOGPEER(peer, LOGL_ERROR, "frame_fifo_out failure for frame %u/%u\n", iline->e1o.next_seq + i, i); } } @@ -146,7 +151,9 @@ } /* send the packet to the peer */ - octoi_tx(iline->peer, E1OIP_MSGT_TDM_DATA, 0, msgb_data(msg), msgb_length(msg)); + octoi_tx(peer, E1OIP_MSGT_TDM_DATA, 0, msgb_data(msg), msgb_length(msg)); + iline_ctr_add(iline, LINE_CTR_E1oIP_TX_PACKETS, 1); + iline_ctr_add(iline, LINE_CTR_E1oIP_TX_BYTES, peer->sock->iph_udph_size + msgb_length(msg)); msgb_free(msg); /* update the local state */ diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 3c5a478..da4716b 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -23,6 +23,10 @@ LINE_CTR_E1oIP_RX_OUT_OF_ORDER, LINE_CTR_E1oIP_RX_OUT_OF_WIN, LINE_CTR_E1oIP_CONNECT_ACCEPT, + LINE_CTR_E1oIP_RX_BYTES, + LINE_CTR_E1oIP_RX_PACKETS, + LINE_CTR_E1oIP_TX_BYTES, + LINE_CTR_E1oIP_TX_PACKETS, }; enum e1oip_line_stat { diff --git a/src/octoi/octoi_fsm.c b/src/octoi/octoi_fsm.c index 3431587..37d0259 100644 --- a/src/octoi/octoi_fsm.c +++ b/src/octoi/octoi_fsm.c @@ -26,6 +26,7 @@ #include "octoi_sock.h" #include "octoi_fsm.h" +#include "e1oip.h" const struct value_string octoi_fsm_event_names[] = { @@ -158,6 +159,12 @@ OSMO_ASSERT(msgb_l1(msg)); OSMO_ASSERT(msgb_l2(msg)); + if (peer->iline) { + iline_ctr_add(peer->iline, LINE_CTR_E1oIP_RX_PACKETS, 1); + iline_ctr_add(peer->iline, LINE_CTR_E1oIP_RX_BYTES, + peer->sock->iph_udph_size + msgb_length(msg)); + } + if (!octoi_msg_validate(fi, msg)) return -1; diff --git a/src/octoi/octoi_sock.c b/src/octoi/octoi_sock.c index 4805d7e..4245d80 100644 --- a/src/octoi/octoi_sock.c +++ b/src/octoi/octoi_sock.c @@ -40,6 +40,44 @@ #include "octoi_sock.h" #include "e1oip.h" +/* determine domain / AF of socket */ +static int sock_get_domain(int fd) +{ + int domain; + socklen_t dom_len = sizeof(domain); + int rc; + + rc = getsockopt(fd, SOL_SOCKET, SO_DOMAIN, &domain, &dom_len); + if (rc < 0) + return rc; + + return domain; +} + +/* typical number of bytes in IP + UDP header for given socket */ +static int sock_get_iph_udph_overhead(int fd) +{ + int rc = sock_get_domain(fd); + if (rc < 0) { + LOGP(DLINP, LOGL_ERROR, "Unable to determine domain of socket %d: %s\n", + fd, strerror(errno)); + goto assume_ipv4; + } + + switch (rc) { + case AF_INET6: + return 40 + 8; + case AF_INET: + return 20 + 8; + default: + LOGP(DLINP, LOGL_ERROR, "Unknown domain %d of socket %d\n", rc, fd); + break; + } + +assume_ipv4: + return 20 + 8; +} + /*********************************************************************** * transmit to remote peer ***********************************************************************/ @@ -400,6 +438,8 @@ LOGP(DLINP, LOGL_NOTICE, "OCTOI server socket at "OSMO_SOCKADDR_STR_FMT"\n", OSMO_SOCKADDR_STR_FMT_ARGS(local)); + sock->iph_udph_size = sock_get_iph_udph_overhead(sock->ofd.fd); + return sock; } @@ -441,6 +481,8 @@ LOGP(DLINP, LOGL_NOTICE, "OCTOI client socket to "OSMO_SOCKADDR_STR_FMT"\n", OSMO_SOCKADDR_STR_FMT_ARGS(remote)); + sock->iph_udph_size = sock_get_iph_udph_overhead(sock->ofd.fd); + /* create [the only] peer */ peer = alloc_peer(sock, (struct sockaddr *) &sa_remote, sizeof(sa_remote)); peer->cfg.remote = *remote; diff --git a/src/octoi/octoi_sock.h b/src/octoi/octoi_sock.h index b251864..17385e1 100644 --- a/src/octoi/octoi_sock.h +++ b/src/octoi/octoi_sock.h @@ -31,6 +31,7 @@ struct osmo_fd ofd; /* file descriptor */ struct llist_head peers; /* list of peers */ void *priv; + unsigned int iph_udph_size; /* size of IP + UDP header */ int (*rx_cb)(struct octoi_peer *peer, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ifde6be0b7d3c5767b684cb8fbbc58bbd5cfb0714 Gerrit-Change-Number: 27899 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: octoi: Support setting IP DSCP and socket priority via VTY

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27857 ) Change subject: octoi: Support setting IP DSCP and socket priority via VTY ...................................................................... octoi: Support setting IP DSCP and socket priority via VTY Let's allow setting IP DSCP and socket priority via the VTY. Note that you must still manually add a kernel egress QoS map from socket priority to IEEE P802.1p PCP (Priority Code Point) like this: ip link set dev eth0.7 type vlan egress-qos-map 0:0 1:1 5:5 6:6 7:7 This will create 1:1 mappings for socket priorities 0, 1, 5, 6 and 7 to the respective IEEE PCP. A higher PCP typically means higher priority, where voice is traditionally using "5". Change-Id: Ic5a6c5a0ec67beb40be4ca95326aca5072a28958 --- M include/osmocom/octoi/octoi.h M src/octoi/octoi_clnt_vty.c M src/octoi/octoi_sock.c M src/octoi/octoi_sock.h M src/octoi/octoi_srv_vty.c 5 files changed, 155 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/octoi/octoi.h b/include/osmocom/octoi/octoi.h index 48ec122..e7ebcaa 100644 --- a/include/osmocom/octoi/octoi.h +++ b/include/osmocom/octoi/octoi.h @@ -42,6 +42,8 @@ struct { struct llist_head accounts; /* list of octoi_account */ struct osmo_sockaddr_str local; /* local socket bind address/port */ + uint8_t dscp; /* IP DSCP value */ + uint8_t priority; /* Socket Priority value */ } cfg; }; @@ -54,6 +56,9 @@ struct osmo_sockaddr_str local; /* local socket bind address/port */ struct octoi_account *account; + + uint8_t dscp; /* IP DSCP value */ + uint8_t priority; /* Socket Priority value */ } cfg; }; diff --git a/src/octoi/octoi_clnt_vty.c b/src/octoi/octoi_clnt_vty.c index 1f8f7d1..756cc9a 100644 --- a/src/octoi/octoi_clnt_vty.c +++ b/src/octoi/octoi_clnt_vty.c @@ -148,6 +148,68 @@ } clnt->sock->rx_cb = octoi_clnt_fsm_rx_cb; + if (clnt->cfg.dscp) { + rc = octoi_sock_set_dscp(clnt->sock, clnt->cfg.dscp); + if (rc < 0) { + vty_out(vty, "%% failed to set DSCP on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + } + + if (clnt->cfg.priority) { + rc = octoi_sock_set_priority(clnt->sock, clnt->cfg.priority); + if (rc < 0) { + vty_out(vty, "%% failed to set priority on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_clnt_dscp, cfg_clnt_dscp_cmd, + "ip-dscp <0-63>", + "Set IP DSCP value for outbound packets\n" + "IP DSCP Value to use\n") +{ + struct octoi_client *clnt = vty->index; + int rc; + + clnt->cfg.dscp = atoi(argv[0]); + + if (!clnt->sock) + return CMD_SUCCESS; + + /* apply to already-existing server */ + rc = octoi_sock_set_dscp(clnt->sock, clnt->cfg.dscp); + if (rc < 0) { + vty_out(vty, "%% failed to set DSCP on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_clnt_prio, cfg_clnt_prio_cmd, + "socket-priority <0-255>", + "Set socket priority value for outbound packets\n" + "Socket Priority\n") +{ + struct octoi_client *clnt = vty->index; + int rc; + + clnt->cfg.priority = atoi(argv[0]); + + if (!clnt->sock) + return CMD_SUCCESS; + + /* apply to already-existing server */ + rc = octoi_sock_set_priority(clnt->sock, clnt->cfg.priority); + if (rc < 0) { + vty_out(vty, "%% failed to set priority on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; } @@ -197,6 +259,11 @@ vty_out(vty, " local-bind %s %u%s", clnt->cfg.local.ip, clnt->cfg.local.port, VTY_NEWLINE); } + if (clnt->cfg.dscp) + vty_out(vty, " ip-dscp %u%s", clnt->cfg.dscp, VTY_NEWLINE); + if (clnt->cfg.priority) + vty_out(vty, " socket-priority %u%s", clnt->cfg.priority, VTY_NEWLINE); + octoi_vty_write_one_account(vty, clnt->cfg.account); } @@ -215,5 +282,7 @@ install_node(&clnt_node, config_write_octoi_clnt); install_element(CONFIG_NODE, &cfg_client_cmd); install_element(OCTOI_CLNT_NODE, &cfg_clnt_local_cmd); + install_element(OCTOI_CLNT_NODE, &cfg_clnt_dscp_cmd); + install_element(OCTOI_CLNT_NODE, &cfg_clnt_prio_cmd); install_element(OCTOI_CLNT_NODE, &cfg_clnt_account_cmd); } diff --git a/src/octoi/octoi_sock.c b/src/octoi/octoi_sock.c index 943270a..4805d7e 100644 --- a/src/octoi/octoi_sock.c +++ b/src/octoi/octoi_sock.c @@ -450,6 +450,16 @@ return sock; } +int octoi_sock_set_dscp(struct octoi_sock *sock, uint8_t dscp) +{ + return osmo_sock_set_dscp(sock->ofd.fd, dscp); +} + +int octoi_sock_set_priority(struct octoi_sock *sock, uint8_t priority) +{ + return osmo_sock_set_priority(sock->ofd.fd, priority); +} + void octoi_sock_destroy(struct octoi_sock *sock) { struct octoi_peer *p1, *p2; diff --git a/src/octoi/octoi_sock.h b/src/octoi/octoi_sock.h index cf7b74b..b251864 100644 --- a/src/octoi/octoi_sock.h +++ b/src/octoi/octoi_sock.h @@ -66,6 +66,9 @@ struct octoi_peer *octoi_sock_client_get_peer(struct octoi_sock *sock); +int octoi_sock_set_dscp(struct octoi_sock *sock, uint8_t dscp); +int octoi_sock_set_priority(struct octoi_sock *sock, uint8_t priority); + void octoi_peer_destroy(struct octoi_peer *peer); int octoi_tx(struct octoi_peer *peer, uint8_t msg_type, uint8_t flags, diff --git a/src/octoi/octoi_srv_vty.c b/src/octoi/octoi_srv_vty.c index c9f63cb..f616af5 100644 --- a/src/octoi/octoi_srv_vty.c +++ b/src/octoi/octoi_srv_vty.c @@ -182,6 +182,68 @@ } srv->sock->rx_cb = octoi_srv_fsm_rx_cb; + if (srv->cfg.dscp) { + rc = octoi_sock_set_dscp(srv->sock, srv->cfg.dscp); + if (rc < 0) { + vty_out(vty, "%% failed to set DSCP on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + } + + if (srv->cfg.priority) { + rc = octoi_sock_set_priority(srv->sock, srv->cfg.priority); + if (rc < 0) { + vty_out(vty, "%% failed to set priority on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_srv_dscp, cfg_srv_dscp_cmd, + "ip-dscp <0-63>", + "Set IP DSCP value for outbound packets\n" + "IP DSCP Value to use\n") +{ + struct octoi_server *srv = vty->index; + int rc; + + srv->cfg.dscp = atoi(argv[0]); + + if (!srv->sock) + return CMD_SUCCESS; + + /* apply to already-existing server */ + rc = octoi_sock_set_dscp(srv->sock, srv->cfg.dscp); + if (rc < 0) { + vty_out(vty, "%% failed to set DSCP on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_srv_prio, cfg_srv_prio_cmd, + "socket-priority <0-255>", + "Set socket priority value for outbound packets\n" + "Socket Priority\n") +{ + struct octoi_server *srv = vty->index; + int rc; + + srv->cfg.priority = atoi(argv[0]); + + if (!srv->sock) + return CMD_SUCCESS; + + /* apply to already-existing server */ + rc = octoi_sock_set_priority(srv->sock, srv->cfg.priority); + if (rc < 0) { + vty_out(vty, "%% failed to set priority on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; } @@ -347,6 +409,10 @@ vty_out(vty, " local-bind %s %u%s", srv->cfg.local.ip, srv->cfg.local.port, VTY_NEWLINE); } + if (srv->cfg.dscp) + vty_out(vty, " ip-dscp %u%s", srv->cfg.dscp, VTY_NEWLINE); + if (srv->cfg.priority) + vty_out(vty, " socket-priority %u%s", srv->cfg.priority, VTY_NEWLINE); llist_for_each_entry(acc, &srv->cfg.accounts, list) octoi_vty_write_one_account(vty, acc); @@ -385,6 +451,8 @@ install_element(CONFIG_NODE, &cfg_server_cmd); //install_element(CONFIG_NODE, &cfg_no_server_cmd); install_element(OCTOI_SRV_NODE, &cfg_srv_local_cmd); + install_element(OCTOI_SRV_NODE, &cfg_srv_dscp_cmd); + install_element(OCTOI_SRV_NODE, &cfg_srv_prio_cmd); install_element(OCTOI_SRV_NODE, &cfg_srv_account_cmd); //install_element(CONFIG_SRV_NODE, &cfg_srv_no_account_cmd); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic5a6c5a0ec67beb40be4ca95326aca5072a28958 Gerrit-Change-Number: 27857 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: octoi: Send ECHO_REQ every 10s and update the related stat_item

by laforge

Attention is currently required from: manawyrm, roox, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27989 ) Change subject: octoi: Send ECHO_REQ every 10s and update the related stat_item ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id331319bff1cf6896fee37acc45846a2491ca92d Gerrit-Change-Number: 27989 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sun, 01 May 2022 09:23:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: e1oip: Add rate_ctr for rx + tx packet / byte count

by laforge

Attention is currently required from: manawyrm, roox, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27899 ) Change subject: e1oip: Add rate_ctr for rx + tx packet / byte count ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/octoi/e1oip.c: https://gerrit.osmocom.org/c/osmo-e1d/+/27899/comment/5800d637_ad4f9f56 PS1, Line 54: [LINE_CTR_E1oIP_RX_BYTES] = { "e1oip:rx:packets", "Number of bytes received including UDP+IP header" }, > rx:packets should be rx_bytes […] thanks,fixed. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ifde6be0b7d3c5767b684cb8fbbc58bbd5cfb0714 Gerrit-Change-Number: 27899 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sun, 01 May 2022 09:23:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: e1oip: fix line counter descriptions

by laforge

Attention is currently required from: manawyrm, roox, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27898 ) Change subject: e1oip: fix line counter descriptions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia294af4b30eec1b32c4b15892751d360608c8333 Gerrit-Change-Number: 27898 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sun, 01 May 2022 09:23:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: octoi: Support setting IP DSCP and socket priority via VTY

by laforge

Attention is currently required from: manawyrm, roox, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27857 ) Change subject: octoi: Support setting IP DSCP and socket priority via VTY ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic5a6c5a0ec67beb40be4ca95326aca5072a28958 Gerrit-Change-Number: 27857 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sun, 01 May 2022 09:23:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022