<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10751">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_common: rename to MGCP_CONN_ID_MAXLEN<br><br>So far, MGCP_CONN_ID_LENGTH was often used as exactly the length of the<br>Connection Identifier. To indicate this length as a maximum, introduce the<br>MGCP_CONN_ID_MAXLEN and use it everywhere. Keep the old name as an alias.<br><br>Change-Id: I1117003c7614e98535d5c201d002e459c01bdc3f<br>---<br>M include/osmocom/mgcp/mgcp_common.h<br>M include/osmocom/mgcp/mgcp_internal.h<br>M include/osmocom/mgcp_client/mgcp_client.h<br>M src/libosmo-mgcp-client/mgcp_client_fsm.c<br>M src/libosmo-mgcp/mgcp_conn.c<br>M src/libosmo-mgcp/mgcp_msg.c<br>6 files changed, 11 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_common.h b/include/osmocom/mgcp/mgcp_common.h</span><br><span>index b2c7370..a658f1c 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_common.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_common.h</span><br><span>@@ -79,9 +79,12 @@</span><br><span> /* Maximum length of the comment field */</span><br><span> #define MGCP_COMMENT_MAXLEN 256</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* String length of Connection Identifiers</span><br><span style="color: hsl(0, 100%, 40%);">- * (see also RFC3435 2.1.3.2 Names of Connections) */</span><br><span style="color: hsl(0, 100%, 40%);">-#define MGCP_CONN_ID_LENGTH 32+1</span><br><span style="color: hsl(120, 100%, 40%);">+/* Maximum allowed String length of Connection Identifiers as per spec</span><br><span style="color: hsl(120, 100%, 40%);">+ * (see also RFC3435 2.1.3.2 Names of Connections), plus one for '\0'. */</span><br><span style="color: hsl(120, 100%, 40%);">+#define MGCP_CONN_ID_MAXLEN 32+1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Deprecated: old name of MGCP_CONN_ID_MAXLEN. */</span><br><span style="color: hsl(120, 100%, 40%);">+#define MGCP_CONN_ID_LENGTH MGCP_CONN_ID_MAXLEN</span><br><span> </span><br><span> /* String length of Endpoint Identifiers.</span><br><span> / (see also RFC3435 section 3.2.1.3) */</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index 06883dd..f75ae8b 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -226,7 +226,7 @@</span><br><span> enum mgcp_connection_mode mode_orig;</span><br><span> </span><br><span> /*! connection id to identify the connection */</span><br><span style="color: hsl(0, 100%, 40%);">- char id[MGCP_CONN_ID_LENGTH];</span><br><span style="color: hsl(120, 100%, 40%);">+ char id[MGCP_CONN_ID_MAXLEN];</span><br><span> </span><br><span> /*! human readable name (vty, logging) */</span><br><span> char name[256];</span><br><span>diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h</span><br><span>index 6c478e8..79f2078 100644</span><br><span>--- a/include/osmocom/mgcp_client/mgcp_client.h</span><br><span>+++ b/include/osmocom/mgcp_client/mgcp_client.h</span><br><span>@@ -60,7 +60,7 @@</span><br><span> int response_code;</span><br><span> mgcp_trans_id_t trans_id;</span><br><span> char comment[MGCP_COMMENT_MAXLEN];</span><br><span style="color: hsl(0, 100%, 40%);">- char conn_id[MGCP_CONN_ID_LENGTH];</span><br><span style="color: hsl(120, 100%, 40%);">+ char conn_id[MGCP_CONN_ID_MAXLEN];</span><br><span> char endpoint[MGCP_ENDPOINT_MAXLEN];</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c</span><br><span>index 5368ec3..da900c5 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client_fsm.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c</span><br><span>@@ -41,7 +41,7 @@</span><br><span> bool mgw_trans_pending;</span><br><span> </span><br><span> /* Connection ID which has been assigned by he MGW */</span><br><span style="color: hsl(0, 100%, 40%);">- char conn_id[MGCP_CONN_ID_LENGTH];</span><br><span style="color: hsl(120, 100%, 40%);">+ char conn_id[MGCP_CONN_ID_MAXLEN];</span><br><span> </span><br><span> /* Local RTP connection info, the MGW will send outgoing traffic to the</span><br><span> * ip/port specified here. The Address does not have to be choosen right</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>index 3a5db0f..2a45b81 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -78,7 +78,7 @@</span><br><span> /* ensure that the generated conn_id is unique</span><br><span> * for this endpoint */</span><br><span> if (!mgcp_conn_get_rtp(endp, id_hex)) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_strlcpy(id, id_hex, MGCP_CONN_ID_LENGTH);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(id, id_hex, MGCP_CONN_ID_MAXLEN);</span><br><span> return 0;</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>index a7c8b47..49d0380 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_msg.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>@@ -450,7 +450,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Check for over long connection identifiers */</span><br><span style="color: hsl(0, 100%, 40%);">- if (strlen(conn_id) > MGCP_CONN_ID_LENGTH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strlen(conn_id) > MGCP_CONN_ID_MAXLEN) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "endpoint:0x%x invalid ConnectionIdentifier (too long) 0x%s\n",</span><br><span> ENDPOINT_NUMBER(endp), conn_id);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10751">change 10751</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/10751"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1117003c7614e98535d5c201d002e459c01bdc3f </div>
<div style="display:none"> Gerrit-Change-Number: 10751 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>