<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12626">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: make 'sh connect/transact' readable again<br><br>After recent changes to vlr_subscr_name() result became variable-length<br>which messes up old vty code. Fix this by moving it to the very end and<br>adjusting headers as necessary. While at it, make sure we don't print<br>headers if we have nothing else to show.<br><br>Change-Id: Id06b4277ff790d95457d0cc2f94ef6bf5366bb21<br>---<br>M src/libmsc/msc_vty.c<br>1 file changed, 24 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/12626/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index 1fdf560..93d093f 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -550,15 +550,21 @@</span><br><span> </span><br><span> static void vty_conn_hdr(struct vty *vty)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "--ConnId ------------Subscriber RAN --LAC Use --Tokens C A5 State%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned lnum = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ran_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(conn, &gsmnet->ran_conns, entry)</span><br><span style="color: hsl(120, 100%, 40%);">+ lnum++;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lnum)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "--ConnId RAN --LAC Use --Tokens C A5 State ------------ Subscriber%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> static void vty_dump_one_conn(struct vty *vty, const struct ran_conn *conn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%08x %22s %3s %5u %3u %08x %c /%1u %27s %s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%08x %3s %5u %3u %08x %c /%1u %27s %22s%s",</span><br><span> conn->a.conn_id,</span><br><span style="color: hsl(0, 100%, 40%);">- conn->vsub ? vlr_subscr_name(conn->vsub) : "-",</span><br><span> conn->via_ran == OSMO_RAT_UTRAN_IU ? "Iu" : "A",</span><br><span> conn->lac,</span><br><span> conn->use_count,</span><br><span>@@ -566,6 +572,7 @@</span><br><span> conn->received_cm_service_request ? 'C' : '-',</span><br><span> conn->geran_encr.alg_id,</span><br><span> conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-",</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->vsub ? vlr_subscr_name(conn->vsub) : "-",</span><br><span> VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span>@@ -583,8 +590,15 @@</span><br><span> </span><br><span> static void vty_trans_hdr(struct vty *vty)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "------------Subscriber --ConnId -P TI -CallRef Proto%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned lnum = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_trans *trans;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(trans, &gsmnet->trans_list, entry)</span><br><span style="color: hsl(120, 100%, 40%);">+ lnum++;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lnum)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "--ConnId -P TI -CallRef [--- Proto ---] ------------ Subscriber%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> static const char *get_trans_proto_str(const struct gsm_trans *trans)</span><br><span>@@ -613,13 +627,14 @@</span><br><span> </span><br><span> static void vty_dump_one_trans(struct vty *vty, const struct gsm_trans *trans)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%22s %08x %s %02u %08x %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- trans->vsub ? vlr_subscr_name(trans->vsub) : "-",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%08x %s %02u %08x [%s] %22s%s",</span><br><span> trans->conn ? trans->conn->a.conn_id : 0,</span><br><span> gsm48_pdisc_name(trans->protocol),</span><br><span> trans->transaction_id,</span><br><span> trans->callref,</span><br><span style="color: hsl(0, 100%, 40%);">- get_trans_proto_str(trans), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_trans_proto_str(trans),</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->vsub ? vlr_subscr_name(trans->vsub) : "-",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> DEFUN(show_msc_transaction, show_msc_transaction_cmd,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12626">change 12626</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/12626"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Id06b4277ff790d95457d0cc2f94ef6bf5366bb21 </div>
<div style="display:none"> Gerrit-Change-Number: 12626 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>