Change in osmo-bsc[master]: abis_nm.c: use abis_nm_ipa_magic from libosmocore

Harald Welte gerrit-no-reply at lists.osmocom.org
Sat Apr 6 10:37:01 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13521 )

Change subject: abis_nm.c: use abis_nm_ipa_magic from libosmocore
......................................................................

abis_nm.c: use abis_nm_ipa_magic from libosmocore

Change-Id: I051ae0550b5375a141e1bd4b3383a54302da83e1
---
M src/osmo-bsc/abis_nm.c
1 file changed, 4 insertions(+), 8 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index 33535a4..a9b5aa5 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -2690,10 +2690,6 @@
 	return abis_nm_sendmsg(bts, msg);
 }
 
-/* ip.access nanoBTS specific commands */
-static const char ipaccess_magic[] = "com.ipaccess";
-
-
 static int abis_nm_rx_ipacc(struct msgb *msg)
 {
 	struct in_addr addr;
@@ -2706,7 +2702,7 @@
 
 	foh = (struct abis_om_fom_hdr *) (oh->data + 1 + idstrlen);
 
-	if (strncmp((char *)&oh->data[1], ipaccess_magic, idstrlen)) {
+	if (strncmp((char *)&oh->data[1], abis_nm_ipa_magic, idstrlen)) {
 		LOGPFOH(DNM, LOGL_ERROR, foh, "id string is not com.ipaccess !?!\n");
 		return -EINVAL;
 	}
@@ -2819,9 +2815,9 @@
 	oh->mdisc = ABIS_OM_MDISC_MANUF;
 
 	/* add the ip.access magic */
-	data = msgb_put(msg, sizeof(ipaccess_magic)+1);
-	*data++ = sizeof(ipaccess_magic);
-	memcpy(data, ipaccess_magic, sizeof(ipaccess_magic));
+	data = msgb_put(msg, sizeof(abis_nm_ipa_magic)+1);
+	*data++ = sizeof(abis_nm_ipa_magic);
+	memcpy(data, abis_nm_ipa_magic, sizeof(abis_nm_ipa_magic));
 
 	/* fill the 12.21 FOM header */
 	foh = (struct abis_om_fom_hdr *) msgb_put(msg, sizeof(*foh));

-- 
To view, visit https://gerrit.osmocom.org/13521
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I051ae0550b5375a141e1bd4b3383a54302da83e1
Gerrit-Change-Number: 13521
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190406/6abf6d4f/attachment.html>


More information about the gerrit-log mailing list