<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/20250">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_vty: add user attributes to configuration commands<br><br>To make clear which configuration changes (configure terminal)<br>apply when, add appropriate user attributes to VTY commands.<br><br>Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9<br>Related: SYS#4937, OS#1601<br>---<br>M include/osmocom/mgcp/vty.h<br>M src/libosmo-mgcp/mgcp_vty.c<br>M src/osmo-mgw/mgw_main.c<br>3 files changed, 248 insertions(+), 180 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/vty.h b/include/osmocom/mgcp/vty.h</span><br><span>index bf6b7a8..862691f 100644</span><br><span>--- a/include/osmocom/mgcp/vty.h</span><br><span>+++ b/include/osmocom/mgcp/vty.h</span><br><span>@@ -6,3 +6,7 @@</span><br><span> MGCP_NODE = _LAST_OSMOVTY_NODE + 1,</span><br><span> TRUNK_NODE,</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum mgw_vty_cmd_attr {</span><br><span style="color: hsl(120, 100%, 40%);">+ MGW_CMD_ATTR_NEWCONN = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index 440452f..74e8da0 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -42,6 +42,7 @@</span><br><span> #define RTP_KEEPALIVE_STR "Send dummy UDP packet to net RTP destination\n"</span><br><span> #define RTP_TS101318_RFC5993_CONV_STR "Convert GSM-HR from TS101318 to RFC5993 and vice versa\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define X(x) (1 << x)</span><br><span> </span><br><span> static struct mgcp_config *g_cfg = NULL;</span><br><span> </span><br><span>@@ -408,13 +409,14 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_local_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "local ip " VTY_IPV46_CMD,</span><br><span style="color: hsl(0, 100%, 40%);">- "Local options for the SDP record\n"</span><br><span style="color: hsl(0, 100%, 40%);">- IP_STR</span><br><span style="color: hsl(0, 100%, 40%);">- "IPv4 Address to use in SDP record\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "IPv6 Address to use in SDP record\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_local_ip_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "local ip " VTY_IPV46_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Local options for the SDP record\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ IP_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "IPv4 Address to use in SDP record\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IPv6 Address to use in SDP record\n")</span><br><span> {</span><br><span> osmo_talloc_replace_string(g_cfg, &g_cfg->local_ip, argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -499,11 +501,12 @@</span><br><span> RTP_STR "Range of ports to use for the NET side\n"</span><br><span> RANGE_START_STR RANGE_END_STR)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_bind_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_bind_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp bind-ip A.B.C.D",</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_STR "Bind endpoints facing the Network\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "IPv4 Address to bind to\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_rtp_bind_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_bind_ip_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp bind-ip A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR "Bind endpoints facing the Network\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IPv4 Address to bind to\n")</span><br><span> {</span><br><span> osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr_v4, argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -513,11 +516,12 @@</span><br><span> "rtp net-bind-ip A.B.C.D",</span><br><span> RTP_STR "Bind endpoints facing the Network\n" "Address to bind to\n")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_no_bind_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_no_bind_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp bind-ip",</span><br><span style="color: hsl(0, 100%, 40%);">- NO_STR RTP_STR "Bind endpoints facing the Network\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Address to bind to\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_rtp_no_bind_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_no_bind_ip_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp bind-ip",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR RTP_STR "Bind endpoints facing the Network\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Address to bind to\n")</span><br><span> {</span><br><span> talloc_free(g_cfg->net_ports.bind_addr_v4);</span><br><span> g_cfg->net_ports.bind_addr_v4 = NULL;</span><br><span>@@ -529,50 +533,55 @@</span><br><span> NO_STR RTP_STR "Bind endpoints facing the Network\n"</span><br><span> "Address to bind to\n")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_bind_ip_v6,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_bind_ip_v6_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp bind-ip-v6 " VTY_IPV6_CMD,</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_STR "Bind endpoints facing the Network\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "IPv6 Address to bind to\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_rtp_bind_ip_v6,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_bind_ip_v6_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp bind-ip-v6 " VTY_IPV6_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR "Bind endpoints facing the Network\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IPv6 Address to bind to\n")</span><br><span> {</span><br><span> osmo_talloc_replace_string(g_cfg, &g_cfg->net_ports.bind_addr_v6, argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_no_bind_ip_v6,</span><br><span style="color: hsl(0, 100%, 40%);">-cfg_mgcp_rtp_no_bind_ip_v6_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-"no rtp bind-ip-v6",</span><br><span style="color: hsl(0, 100%, 40%);">-NO_STR RTP_STR "Bind endpoints facing the Network\n"</span><br><span style="color: hsl(0, 100%, 40%);">-"Address to bind to\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_rtp_no_bind_ip_v6,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_no_bind_ip_v6_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp bind-ip-v6",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR RTP_STR "Bind endpoints facing the Network\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Address to bind to\n")</span><br><span> {</span><br><span> talloc_free(g_cfg->net_ports.bind_addr_v6);</span><br><span> g_cfg->net_ports.bind_addr_v6 = NULL;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_net_bind_ip_probing,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_net_bind_ip_probing_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp ip-probing",</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_STR "automatic rtp bind ip selection\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_rtp_net_bind_ip_probing,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_net_bind_ip_probing_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp ip-probing",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR "automatic rtp bind ip selection\n")</span><br><span> {</span><br><span> g_cfg->net_ports.bind_addr_probe = true;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_no_net_bind_ip_probing,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_no_net_bind_ip_probing_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp ip-probing",</span><br><span style="color: hsl(0, 100%, 40%);">- NO_STR RTP_STR "no automatic rtp bind ip selection\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_rtp_no_net_bind_ip_probing,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_no_net_bind_ip_probing_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp ip-probing",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR RTP_STR "no automatic rtp bind ip selection\n")</span><br><span> {</span><br><span> g_cfg->net_ports.bind_addr_probe = false;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_ip_dscp,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_ip_dscp_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp ip-dscp <0-255>",</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_STR</span><br><span style="color: hsl(0, 100%, 40%);">- "Apply IP_TOS to the audio stream (including Osmux)\n" "The DSCP value\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_rtp_ip_dscp,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_ip_dscp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp ip-dscp <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Apply IP_TOS to the audio stream (including Osmux)\n" "The DSCP value\n")</span><br><span> {</span><br><span> int dscp = atoi(argv[0]);</span><br><span> g_cfg->endp_dscp = dscp;</span><br><span>@@ -584,29 +593,32 @@</span><br><span> RTP_STR</span><br><span> "Apply IP_TOS to the audio stream\n" "The DSCP value\n")</span><br><span> #define FORCE_PTIME_STR "Force a fixed ptime for packets sent"</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_force_ptime,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_force_ptime_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp force-ptime (10|20|40)",</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_STR FORCE_PTIME_STR</span><br><span style="color: hsl(0, 100%, 40%);">- "The required ptime (packet duration) in ms\n" "10 ms\n20 ms\n40 ms\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_rtp_force_ptime,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_force_ptime_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp force-ptime (10|20|40)",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR FORCE_PTIME_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "The required ptime (packet duration) in ms\n" "10 ms\n20 ms\n40 ms\n")</span><br><span> {</span><br><span> g_cfg->force_ptime = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_rtp_force_ptime,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_rtp_force_ptime_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp force-ptime", NO_STR RTP_STR FORCE_PTIME_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_no_rtp_force_ptime,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_rtp_force_ptime_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp force-ptime", NO_STR RTP_STR FORCE_PTIME_STR)</span><br><span> {</span><br><span> g_cfg->force_ptime = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_sdp_fmtp_extra,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_sdp_fmtp_extra_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "sdp audio fmtp-extra .NAME",</span><br><span style="color: hsl(0, 100%, 40%);">- "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Extra Information\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_sdp_fmtp_extra,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_sdp_fmtp_extra_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "sdp audio fmtp-extra .NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Extra Information\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -619,9 +631,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_allow_transcoding,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_allow_transcoding_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "allow-transcoding", "Allow transcoding\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_allow_transcoding,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_allow_transcoding_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "allow-transcoding", "Allow transcoding\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -629,9 +642,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_allow_transcoding,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_allow_transcoding_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no allow-transcoding", NO_STR "Allow transcoding\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_no_allow_transcoding,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_allow_transcoding_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no allow-transcoding", NO_STR "Allow transcoding\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -666,10 +680,11 @@</span><br><span> "sdp audio payload name NAME",</span><br><span> SDP_STR AUDIO_STR AUDIO_STR "Name\n" "Payload name\n")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_sdp_payload_send_ptime,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_sdp_payload_send_ptime_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "sdp audio-payload send-ptime",</span><br><span style="color: hsl(0, 100%, 40%);">- SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_sdp_payload_send_ptime,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_sdp_payload_send_ptime_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "sdp audio-payload send-ptime",</span><br><span style="color: hsl(120, 100%, 40%);">+ SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -677,10 +692,11 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_sdp_payload_send_ptime,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_sdp_payload_send_ptime_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no sdp audio-payload send-ptime",</span><br><span style="color: hsl(0, 100%, 40%);">- NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_no_sdp_payload_send_ptime,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_sdp_payload_send_ptime_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no sdp audio-payload send-ptime",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -688,10 +704,11 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_sdp_payload_send_name,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_sdp_payload_send_name_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "sdp audio-payload send-name",</span><br><span style="color: hsl(0, 100%, 40%);">- SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_sdp_payload_send_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_sdp_payload_send_name_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "sdp audio-payload send-name",</span><br><span style="color: hsl(120, 100%, 40%);">+ SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -699,10 +716,11 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_sdp_payload_send_name,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_sdp_payload_send_name_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no sdp audio-payload send-name",</span><br><span style="color: hsl(0, 100%, 40%);">- NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_no_sdp_payload_send_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_sdp_payload_send_name_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no sdp audio-payload send-name",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -718,11 +736,12 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_force_realloc,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_force_realloc_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "force-realloc (0|1)",</span><br><span style="color: hsl(0, 100%, 40%);">- "Force endpoint reallocation when the endpoint is still seized\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Don't force reallocation\n" "force reallocation\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_force_realloc,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_force_realloc_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "force-realloc (0|1)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Force endpoint reallocation when the endpoint is still seized\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Don't force reallocation\n" "force reallocation\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -730,11 +749,12 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_accept_all,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_accept_all_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp-accept-all (0|1)",</span><br><span style="color: hsl(0, 100%, 40%);">- "Accept all RTP packets, even when the originating IP/Port does not match\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "enable filter\n" "disable filter\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_mgcp_rtp_accept_all,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_accept_all_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp-accept-all (0|1)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Accept all RTP packets, even when the originating IP/Port does not match\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "enable filter\n" "disable filter\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -753,15 +773,21 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_omit_rtcp, cfg_mgcp_omit_rtcp_cmd, "rtcp-omit", RTCP_OMIT_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_mgcp_omit_rtcp,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_omit_rtcp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtcp-omit", RTCP_OMIT_STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> trunk->omit_rtcp = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_omit_rtcp,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_omit_rtcp_cmd, "no rtcp-omit", NO_STR RTCP_OMIT_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_mgcp_no_omit_rtcp,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_omit_rtcp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtcp-omit",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR RTCP_OMIT_STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -769,9 +795,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_patch_rtp_ssrc,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_patch_rtp_ssrc_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_patch_rtp_ssrc,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_patch_rtp_ssrc_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -779,9 +806,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_patch_rtp_ssrc,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_patch_rtp_ssrc_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_no_patch_rtp_ssrc,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_patch_rtp_ssrc_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -789,9 +817,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_patch_rtp_ts,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_patch_rtp_ts_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_patch_rtp_ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_patch_rtp_ts_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -799,9 +828,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_patch_rtp_ts,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_patch_rtp_ts_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_no_patch_rtp_ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_patch_rtp_ts_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -809,9 +839,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_patch_rtp_rfc5993hr,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_patch_rtp_rfc5993hr_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_patch_rtp_rfc5993hr,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_patch_rtp_rfc5993hr_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -819,9 +850,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_patch_rtp_rfc5993hr,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_patch_rtp_rfc5993hr_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_no_patch_rtp_rfc5993hr,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_patch_rtp_rfc5993hr_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -829,8 +861,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_patch_rtp,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_mgcp_no_patch_rtp,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_patch_rtp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp-patch", NO_STR RTP_PATCH_STR)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -840,10 +874,11 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_keepalive,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_keepalive_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp keep-alive <1-120>",</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_STR RTP_KEEPALIVE_STR "Keep alive interval in secs\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_mgcp_rtp_keepalive,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_keepalive_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp keep-alive <1-120>",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR RTP_KEEPALIVE_STR "Keep alive interval in secs\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -851,10 +886,11 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_rtp_keepalive_once,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_rtp_keepalive_once_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp keep-alive once",</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_mgcp_rtp_keepalive_once,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_rtp_keepalive_once_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp keep-alive once",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -862,9 +898,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_no_rtp_keepalive,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_no_rtp_keepalive_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_mgcp_no_rtp_keepalive,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_no_rtp_keepalive_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span>@@ -969,11 +1006,12 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_sdp_fmtp_extra,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_sdp_fmtp_extra_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "sdp audio fmtp-extra .NAME",</span><br><span style="color: hsl(0, 100%, 40%);">- "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Extra Information\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_sdp_fmtp_extra,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_sdp_fmtp_extra_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "sdp audio fmtp-extra .NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Extra Information\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> char *txt = argv_concat(argv, argc, 0);</span><br><span>@@ -1017,117 +1055,134 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_sdp_payload_send_ptime,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_sdp_payload_send_ptime_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "sdp audio-payload send-ptime",</span><br><span style="color: hsl(0, 100%, 40%);">- SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_sdp_payload_send_ptime,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_sdp_payload_send_ptime_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "sdp audio-payload send-ptime",</span><br><span style="color: hsl(120, 100%, 40%);">+ SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->audio_send_ptime = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_no_sdp_payload_send_ptime,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_no_sdp_payload_send_ptime_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no sdp audio-payload send-ptime",</span><br><span style="color: hsl(0, 100%, 40%);">- NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_no_sdp_payload_send_ptime,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_no_sdp_payload_send_ptime_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no sdp audio-payload send-ptime",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->audio_send_ptime = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_sdp_payload_send_name,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_sdp_payload_send_name_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "sdp audio-payload send-name",</span><br><span style="color: hsl(0, 100%, 40%);">- SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_sdp_payload_send_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_sdp_payload_send_name_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "sdp audio-payload send-name",</span><br><span style="color: hsl(120, 100%, 40%);">+ SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->audio_send_name = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_no_sdp_payload_send_name,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_no_sdp_payload_send_name_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no sdp audio-payload send-name",</span><br><span style="color: hsl(0, 100%, 40%);">- NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_no_sdp_payload_send_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_no_sdp_payload_send_name_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no sdp audio-payload send-name",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->audio_send_name = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_omit_rtcp, cfg_trunk_omit_rtcp_cmd, "rtcp-omit", RTCP_OMIT_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_trunk_omit_rtcp,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_omit_rtcp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtcp-omit", RTCP_OMIT_STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->omit_rtcp = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_no_omit_rtcp,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_no_omit_rtcp_cmd, "no rtcp-omit", NO_STR RTCP_OMIT_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_trunk_no_omit_rtcp,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_no_omit_rtcp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtcp-omit", NO_STR RTCP_OMIT_STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->omit_rtcp = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_patch_rtp_ssrc,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_patch_rtp_ssrc_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_patch_rtp_ssrc,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_patch_rtp_ssrc_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->force_constant_ssrc = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_no_patch_rtp_ssrc,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_no_patch_rtp_ssrc_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_no_patch_rtp_ssrc,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_no_patch_rtp_ssrc_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->force_constant_ssrc = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_patch_rtp_ts,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_patch_rtp_ts_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_patch_rtp_ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_patch_rtp_ts_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->force_aligned_timing = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_no_patch_rtp_ts,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_no_patch_rtp_ts_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_no_patch_rtp_ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_no_patch_rtp_ts_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->force_aligned_timing = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_patch_rtp_rfc5993hr,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_patch_rtp_rfc5993hr_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_patch_rtp_rfc5993hr,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_patch_rtp_rfc5993hr_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->rfc5993_hr_convert = true;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_no_patch_rtp_rfc5993hr,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_no_patch_rtp_rfc5993hr_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_no_patch_rtp_rfc5993hr,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_no_patch_rtp_rfc5993hr_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->rfc5993_hr_convert = false;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_no_patch_rtp,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_no_patch_rtp,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_no_patch_rtp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp-patch", NO_STR RTP_PATCH_STR)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->force_constant_ssrc = 0;</span><br><span>@@ -1136,47 +1191,52 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_rtp_keepalive,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_rtp_keepalive_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp keep-alive <1-120>",</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_STR RTP_KEEPALIVE_STR "Keep-alive interval in secs\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_trunk_rtp_keepalive,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_rtp_keepalive_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp keep-alive <1-120>",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR RTP_KEEPALIVE_STR "Keep-alive interval in secs\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> mgcp_trunk_set_keepalive(trunk, atoi(argv[0]));</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_rtp_keepalive_once,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_rtp_keepalive_once_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp keep-alive once",</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_trunk_rtp_keepalive_once,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_rtp_keepalive_once_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp keep-alive once",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_no_rtp_keepalive,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_no_rtp_keepalive_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_trunk_no_rtp_keepalive,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_no_rtp_keepalive_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> mgcp_trunk_set_keepalive(trunk, 0);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_allow_transcoding,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_allow_transcoding_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "allow-transcoding", "Allow transcoding\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_allow_transcoding,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_allow_transcoding_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "allow-transcoding", "Allow transcoding\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->no_audio_transcoding = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_no_allow_transcoding,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_no_allow_transcoding_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no allow-transcoding", NO_STR "Allow transcoding\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_trunk_no_allow_transcoding,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_no_allow_transcoding_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(MGW_CMD_ATTR_NEWCONN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "no allow-transcoding", NO_STR "Allow transcoding\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = vty->index;</span><br><span> trunk->no_audio_transcoding = 1;</span><br><span>diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c</span><br><span>index 37357a0..4139172 100644</span><br><span>--- a/src/osmo-mgw/mgw_main.c</span><br><span>+++ b/src/osmo-mgw/mgw_main.c</span><br><span>@@ -306,6 +306,10 @@</span><br><span> return -1;</span><br><span> </span><br><span> vty_info.copyright = osmomgw_copyright;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_info.usr_attr_desc[MGW_CMD_ATTR_NEWCONN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ "This command applies when a new connection is created";</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_info.usr_attr_letters[MGW_CMD_ATTR_NEWCONN] = 'n';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vty_init(&vty_info);</span><br><span> logging_vty_add_cmds();</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/20250">change 20250</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-mgw/+/20250"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2d9487801b3b78f94577264b56d217c926ef76a9 </div>
<div style="display:none"> Gerrit-Change-Number: 20250 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>