Change in osmo-mgw[master]: cosmetic: mgcp_test: fix get_conn_id_from_response()
Neels Hofmeyr has submitted this change and it was merged. (
https://gerrit.osmocom.org/10679 )
Change subject: cosmetic: mgcp_test: fix get_conn_id_from_response()
..
cosmetic: mgcp_test: fix get_conn_id_from_response()
This function is implemented in such a weird way that I couldn't stop myself
from rewriting it.
Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b
---
M tests/mgcp/mgcp_test.c
1 file changed, 30 insertions(+), 35 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index b9f7253..4cb16dd 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -607,47 +607,42 @@
MGCP_CONN_RECV_SEND);
}
-/* Extract a connection ID from a response (CRCX) */
+/* Extract a connection ID from a response and return in conn_id;
+ * if there is none, return -EINVAL and leave conn_id unchanged. */
static int get_conn_id_from_response(uint8_t *resp, char *conn_id,
-unsigned int conn_id_len)
+size_t conn_id_buflen)
{
- char *conn_id_ptr;
- int i;
- bool got_conn_id = false;
+ const char *conn_id_start;
+ const char *conn_id_end;
+ int conn_id_len;
- /* First try to get the conn_id from the I: parameter */
- conn_id_ptr = strstr((char *)resp, "I: ");
- if (conn_id_ptr) {
- memset(conn_id, 0, conn_id_len);
- memcpy(conn_id, conn_id_ptr + 3, 32);
- got_conn_id = true;
- } else {
- /* Alternatively try to extract the conn_id from the o=- SDP
-* parameter */
- conn_id_ptr = strstr((char *)resp, "o=- ");
- if(conn_id_ptr) {
- memset(conn_id, 0, conn_id_len);
- memcpy(conn_id, conn_id_ptr + 4, 32);
- got_conn_id = true;
- }
- }
+ const char *header_I = "\r\nI: ";
+ const char *header_o = "\r\no=- ";
- if (got_conn_id) {
- for (i = 0; i < conn_id_len; i++) {
- if (!isxdigit(conn_id[i])) {
- conn_id[i] = '\0';
- break;
- }
- }
+ /* Try to get the conn_id from the 'I:' or 'o=-' parameter */
+ if ((conn_id_start = strstr((char *)resp, header_I))) {
+ conn_id_start += strlen(header_I);
+ conn_id_end = strstr(conn_id_start, "\r\n");
+ } else if ((conn_id_start = strstr((char *)resp, header_o))) {
+ conn_id_start += strlen(header_o);
+ conn_id_end = strchr(conn_id_start, ' ');
+ } else
+ return -EINVAL;
- /* A valid conn_id must at least contain one digit, and must
-* not exceed a length of 32 digits */
- OSMO_ASSERT(strlen(conn_id) <= 32);
- OSMO_ASSERT(strlen(conn_id) > 0);
+ if (conn_id_end)
+ conn_id_len = conn_id_end - conn_id_start;
+ else
+ conn_id_len = strlen(conn_id_start);
+ OSMO_ASSERT(conn_id_len <= conn_id_buflen - 1);
- return 0;
- }
- return -EINVAL;
+ /* A valid conn_id must at least contain one digit, and must
+* not exceed a length of 32 digits */
+ OSMO_ASSERT(conn_id_len <= 32);
+ OSMO_ASSERT(conn_id_len > 0);
+
+ strncpy(conn_id, conn_id_start, conn_id_len);
+ conn_id[conn_id_len] = '\0';
+ return 0;
}
/* Check response, automatically patch connection ID if needed */
--
To view, visit https://gerrit.osmocom.org/10679
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b
Gerrit-Change-Number: 10679
Gerrit-PatchSet: 5
Gerrit-Owner: Neels Hofmeyr
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr
Change in osmo-mgw[master]: cosmetic: mgcp_test: fix get_conn_id_from_response()
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10679 to look at the new patch set (#5). Change subject: cosmetic: mgcp_test: fix get_conn_id_from_response() .. cosmetic: mgcp_test: fix get_conn_id_from_response() This function is implemented in such a weird way that I couldn't stop myself from rewriting it. Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b --- M tests/mgcp/mgcp_test.c 1 file changed, 30 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/79/10679/5 -- To view, visit https://gerrit.osmocom.org/10679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b Gerrit-Change-Number: 10679 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-mgw[master]: cosmetic: mgcp_test: fix get_conn_id_from_response()
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10679 ) Change subject: cosmetic: mgcp_test: fix get_conn_id_from_response() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b Gerrit-Change-Number: 10679 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:15:02 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-mgw[master]: cosmetic: mgcp_test: fix get_conn_id_from_response()
Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/10679
Change subject: cosmetic: mgcp_test: fix get_conn_id_from_response()
..
cosmetic: mgcp_test: fix get_conn_id_from_response()
This function is implemented in such a weird way that I couldn't stop myself
from rewriting it.
Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b
---
M tests/mgcp/mgcp_test.c
1 file changed, 30 insertions(+), 35 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/79/10679/1
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index ea66069..a26acf9 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -600,47 +600,42 @@
MGCP_CONN_RECV_SEND);
}
-/* Extract a connection ID from a response (CRCX) */
+/* Extract a connection ID from a response and return in conn_id;
+ * if there is none, return -EINVAL and leave conn_id unchanged. */
static int get_conn_id_from_response(uint8_t *resp, char *conn_id,
-unsigned int conn_id_len)
+size_t conn_id_buflen)
{
- char *conn_id_ptr;
- int i;
- bool got_conn_id = false;
+ const char *conn_id_start;
+ const char *conn_id_end;
+ int conn_id_len;
- /* First try to get the conn_id from the I: parameter */
- conn_id_ptr = strstr((char *)resp, "I: ");
- if (conn_id_ptr) {
- memset(conn_id, 0, conn_id_len);
- memcpy(conn_id, conn_id_ptr + 3, 32);
- got_conn_id = true;
- } else {
- /* Alternatively try to extract the conn_id from the o=- SDP
-* parameter */
- conn_id_ptr = strstr((char *)resp, "o=- ");
- if(conn_id_ptr) {
- memset(conn_id, 0, conn_id_len);
- memcpy(conn_id, conn_id_ptr + 4, 32);
- got_conn_id = true;
- }
- }
+ const char *header_I = "\r\nI: ";
+ const char *header_o = "\r\no=- ";
- if (got_conn_id) {
- for (i = 0; i < conn_id_len; i++) {
- if (!isxdigit(conn_id[i])) {
- conn_id[i] = '\0';
- break;
- }
- }
+ /* Try to get the conn_id from the 'I:' or 'o=-' parameter */
+ if ((conn_id_start = strstr((char *)resp, header_I))) {
+ conn_id_start += strlen(header_I);
+ conn_id_end = strstr(conn_id_start, "\r\n");
+ } else if ((conn_id_start = strstr((char *)resp, header_o))) {
+ conn_id_start += strlen(header_o);
+ conn_id_end = strchr(conn_id_start, ' ');
+ } else
+ return -EINVAL;
- /* A valid conn_id must at least contain one digit, and must
-* not exceed a length of 32 digits */
- OSMO_ASSERT(strlen(conn_id) <= 32);
- OSMO_ASSERT(strlen(conn_id) > 0);
+ if (conn_id_end)
+ conn_id_len = conn_id_end - conn_id_start;
+ else
+ conn_id_len = strlen(conn_id_start);
+ OSMO_ASSERT(conn_id_len <= conn_id_buflen - 1);
- return 0;
- }
- return -EINVAL;
+ /* A valid conn_id must at least contain one digit, and must
+* not exceed a length of 32 digits */
+ OSMO_ASSERT(conn_id_len <= 32);
+ OSMO_ASSERT(conn_id_len > 0);
+
+ strncpy(conn_id, conn_id_start, conn_id_len);
+ conn_id[conn_id_len] = '\0';
+ return 0;
}
/* Check response, automatically patch connection ID if needed */
--
To view, visit https://gerrit.osmocom.org/10679
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b
Gerrit-Change-Number: 10679
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr
