<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19249">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel<br><br>This adds the related code to the server and client side of the CTL<br>interface to switch a line between CHANNELIZED and SUPERCHANNEL.<br><br>Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6<br>---<br>M include/osmocom/e1d/proto.h<br>M include/osmocom/e1d/proto_clnt.h<br>M src/ctl.c<br>M src/proto.c<br>M src/proto_clnt.c<br>5 files changed, 122 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h</span><br><span>index 6711332..d8bce1f 100644</span><br><span>--- a/include/osmocom/e1d/proto.h</span><br><span>+++ b/include/osmocom/e1d/proto.h</span><br><span>@@ -2,6 +2,7 @@</span><br><span> * proto.h</span><br><span> *</span><br><span> * (C) 2019 by Sylvain Munaut <tnt@246tNt.com></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2020 by Harald Welte <laforge@gnumonks.org></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -44,6 +45,11 @@</span><br><span> * in: n/a</span><br><span> * out: array of osmo_e1dp_ts_info</span><br><span> *</span><br><span style="color: hsl(120, 100%, 40%);">+ * E1DP_CMD_LINE_CONFIG</span><br><span style="color: hsl(120, 100%, 40%);">+ * filter: intf (required), line (required)</span><br><span style="color: hsl(120, 100%, 40%);">+ * in: osmo_e1dp_line_config</span><br><span style="color: hsl(120, 100%, 40%);">+ * out: osmo_e1dp_line_info</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * E1DP_CMD_TS_OPEN</span><br><span> * filter: intf (required), line (required), ts (required)</span><br><span> * in: osmo_e1dp_ts_config</span><br><span>@@ -55,6 +61,7 @@</span><br><span> E1DP_CMD_INTF_QUERY = 0x00,</span><br><span> E1DP_CMD_LINE_QUERY = 0x01,</span><br><span> E1DP_CMD_TS_QUERY = 0x02,</span><br><span style="color: hsl(120, 100%, 40%);">+ E1DP_CMD_LINE_CONFIG = 0x03,</span><br><span> E1DP_CMD_TS_OPEN = 0x04,</span><br><span> E1DP_EVT_TYPE = 0x40,</span><br><span> E1DP_RESP_TYPE = 0x80,</span><br><span>@@ -62,6 +69,12 @@</span><br><span> E1DP_TYPE_MSK = 0xc0,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum osmo_e1dp_line_mode {</span><br><span style="color: hsl(120, 100%, 40%);">+ E1DP_LMODE_OFF = 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+ E1DP_LMODE_CHANNELIZED = 0x20,</span><br><span style="color: hsl(120, 100%, 40%);">+ E1DP_LMODE_SUPERCHANNEL = 0x21,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum osmo_e1dp_ts_mode {</span><br><span> E1DP_TSMODE_OFF = 0x00,</span><br><span> E1DP_TSMODE_RAW = 0x10,</span><br><span>@@ -91,8 +104,13 @@</span><br><span> uint8_t n_lines;</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_e1dp_line_config {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t mode;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_e1dp_line_info {</span><br><span> uint8_t id;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_e1dp_line_config cfg;</span><br><span> uint8_t status; /* TBD */</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span>@@ -111,4 +129,5 @@</span><br><span> int osmo_e1dp_send(struct osmo_fd *ofd, struct msgb *msgb, int fd);</span><br><span> </span><br><span> extern const struct value_string osmo_e1dp_msg_type_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string osmo_e1dp_line_mode_names[];</span><br><span> extern const struct value_string osmo_e1dp_ts_mode_names[];</span><br><span>diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h</span><br><span>index 0914de7..ff2cebf 100644</span><br><span>--- a/include/osmocom/e1d/proto_clnt.h</span><br><span>+++ b/include/osmocom/e1d/proto_clnt.h</span><br><span>@@ -41,6 +41,8 @@</span><br><span> int osmo_e1dp_client_ts_query(struct osmo_e1dp_client *clnt,</span><br><span> struct osmo_e1dp_ts_info **ti, int *n,</span><br><span> uint8_t intf, uint8_t line, uint8_t ts);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_e1dp_client_line_config(struct osmo_e1dp_client *clnt,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t intf, uint8_t line, enum osmo_e1dp_line_mode mode);</span><br><span> int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt,</span><br><span> uint8_t intf, uint8_t line, uint8_t ts,</span><br><span> enum osmo_e1dp_ts_mode mode);</span><br><span>diff --git a/src/ctl.c b/src/ctl.c</span><br><span>index 5322ab4..4e74485 100644</span><br><span>--- a/src/ctl.c</span><br><span>+++ b/src/ctl.c</span><br><span>@@ -2,6 +2,7 @@</span><br><span> * ctl.c</span><br><span> *</span><br><span> * (C) 2019 by Sylvain Munaut <tnt@246tNt.com></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2020 by Harald Welte <laforge@gnumonks.org></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -87,6 +88,16 @@</span><br><span> _e1d_fill_line_info(struct osmo_e1dp_line_info *li, struct e1_line *line)</span><br><span> {</span><br><span> li->id = line->id;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (line->mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_LINE_MODE_CHANNELIZED:</span><br><span style="color: hsl(120, 100%, 40%);">+ li->cfg.mode = E1DP_LMODE_CHANNELIZED;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_LINE_MODE_SUPERCHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ li->cfg.mode = E1DP_LMODE_SUPERCHANNEL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> li->status = 0x00;</span><br><span> }</span><br><span> </span><br><span>@@ -273,6 +284,53 @@</span><br><span> }</span><br><span> </span><br><span> static int</span><br><span style="color: hsl(120, 100%, 40%);">+_e1d_ctl_line_config(void *data, struct msgb *msgb, struct msgb *rmsgb, int *rfd)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_daemon *e1d = (struct e1_daemon *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_e1dp_msg_hdr *hdr = msgb_l1(msgb);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_e1dp_line_config *cfg = msgb_l2(msgb);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_e1dp_line_info *info;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_intf *intf = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_line *line = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Process query and find timeslot */</span><br><span style="color: hsl(120, 100%, 40%);">+ intf = e1d_find_intf(e1d, hdr->intf);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!intf)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ line = e1_intf_find_line(intf, hdr->line);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!line)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLI(line, DE1D, LOGL_NOTICE, "Setting line mode from %s to %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(e1_line_mode_names, line->mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(osmo_e1dp_line_mode_names, cfg->mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Select mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (cfg->mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1DP_LMODE_CHANNELIZED:</span><br><span style="color: hsl(120, 100%, 40%);">+ line->mode = E1_LINE_MODE_CHANNELIZED;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1DP_LMODE_SUPERCHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ line->mode = E1_LINE_MODE_SUPERCHANNEL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allocate response */</span><br><span style="color: hsl(120, 100%, 40%);">+ rmsgb->l2h = msgb_put(rmsgb, sizeof(struct osmo_e1dp_line_info));</span><br><span style="color: hsl(120, 100%, 40%);">+ info = msgb_l2(rmsgb);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(info, 0x00, sizeof(struct osmo_e1dp_line_info));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Fill reponse */</span><br><span style="color: hsl(120, 100%, 40%);">+ _e1d_fill_line_info(info, line);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span> _e1d_ctl_ts_open(void *data, struct msgb *msgb, struct msgb *rmsgb, int *rfd)</span><br><span> {</span><br><span> struct e1_daemon *e1d = (struct e1_daemon *)data;</span><br><span>@@ -355,6 +413,12 @@</span><br><span> .fn = _e1d_ctl_ts_query,</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = E1DP_CMD_LINE_CONFIG,</span><br><span style="color: hsl(120, 100%, 40%);">+ .flags = E1DP_SF_INTF_REQ | E1DP_SF_LINE_REQ,</span><br><span style="color: hsl(120, 100%, 40%);">+ .payload_len = sizeof(struct osmo_e1dp_line_config),</span><br><span style="color: hsl(120, 100%, 40%);">+ .fn = _e1d_ctl_line_config,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span> .type = E1DP_CMD_TS_OPEN,</span><br><span> .flags = E1DP_SF_INTF_REQ | E1DP_SF_LINE_REQ | E1DP_SF_TS_REQ,</span><br><span> .payload_len = sizeof(struct osmo_e1dp_ts_config),</span><br><span>diff --git a/src/proto.c b/src/proto.c</span><br><span>index 85f5115..479175a 100644</span><br><span>--- a/src/proto.c</span><br><span>+++ b/src/proto.c</span><br><span>@@ -46,6 +46,12 @@</span><br><span> { E1DP_ERR_TYPE, "ERR_TYPE" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string osmo_e1dp_line_mode_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { E1DP_LMODE_OFF, "OFF" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { E1DP_LMODE_CHANNELIZED, "CHANNELIZED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { E1DP_LMODE_SUPERCHANNEL, "SUPERCHANNEL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> const struct value_string osmo_e1dp_ts_mode_names[] = {</span><br><span> { E1DP_TSMODE_OFF, "OFF" },</span><br><span> { E1DP_TSMODE_RAW, "RAW" },</span><br><span>diff --git a/src/proto_clnt.c b/src/proto_clnt.c</span><br><span>index 7c6df27..ca62abe 100644</span><br><span>--- a/src/proto_clnt.c</span><br><span>+++ b/src/proto_clnt.c</span><br><span>@@ -2,6 +2,7 @@</span><br><span> * proto_clnt.c</span><br><span> *</span><br><span> * (C) 2019 by Sylvain Munaut <tnt@246tNt.com></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2020 by Harald Welte <laforge@gnumonks.org></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -285,6 +286,36 @@</span><br><span> }</span><br><span> </span><br><span> int</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_e1dp_client_line_config(struct osmo_e1dp_client *clnt,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t intf, uint8_t line, enum osmo_e1dp_line_mode mode)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msgb;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_e1dp_msg_hdr hdr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_e1dp_line_config cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&hdr, 0x00, sizeof(struct osmo_e1dp_msg_hdr));</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.type = E1DP_CMD_LINE_CONFIG;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.intf = intf;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.line = line;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.ts = E1DP_INVALID;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&cfg, 0x00, sizeof(struct osmo_e1dp_line_config));</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg.mode = mode;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = _e1dp_client_query_base(clnt, &hdr, &cfg, sizeof(struct osmo_e1dp_line_config), &msgb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_l2len(msgb) != sizeof(struct osmo_e1dp_line_info))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EPIPE;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msgb);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span> osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt,</span><br><span> uint8_t intf, uint8_t line, uint8_t ts,</span><br><span> enum osmo_e1dp_ts_mode mode)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19249">change 19249</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-e1d/+/19249"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 </div>
<div style="display:none"> Gerrit-Change-Number: 19249 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>