diff options
author | Harald Welte <laforge@gnumonks.org> | 2014-08-17 18:41:19 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2014-08-18 20:48:56 +0200 |
commit | bc82b0189a3f8f7402c4986c21362f8fb89474ce (patch) | |
tree | 4f18053d4ac50ec91144a8c4a7220a2f5d522a73 /src/common/msg_utils.c | |
parent | fcd5c367d17d5435771636d06a27980ed7a39a47 (diff) |
replace oml_{osmo,ipa}_magic[] with abis_nm_{osmo,ipa}_magic
the latter is now in libosmogsm.
Diffstat (limited to 'src/common/msg_utils.c')
-rw-r--r-- | src/common/msg_utils.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/common/msg_utils.c b/src/common/msg_utils.c index 2d5ebd9b..f3cba090 100644 --- a/src/common/msg_utils.c +++ b/src/common/msg_utils.c @@ -23,6 +23,7 @@ #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/gsm/protocol/gsm_12_21.h> +#include <osmocom/gsm/abis_nm.h> #include <osmocom/core/msgb.h> #include <arpa/inet.h> @@ -63,16 +64,16 @@ static int check_manuf(struct msgb *msg, struct abis_om_hdr *omh, size_t msg_siz return -1; } - if (omh->data[0] == sizeof(oml_ipa_magic) && - strncmp(oml_ipa_magic, (const char *)omh->data + 1, - sizeof(oml_ipa_magic)) == 0) { + if (omh->data[0] == sizeof(abis_nm_ipa_magic) && + strncmp(abis_nm_ipa_magic, (const char *)omh->data + 1, + sizeof(abis_nm_ipa_magic)) == 0) { type = OML_MSG_TYPE_IPA; - size = sizeof(oml_ipa_magic) + 1; - } else if (omh->data[0] == sizeof(oml_osmo_magic) && - strncmp(oml_osmo_magic, (const char *) omh->data + 1, - sizeof(oml_osmo_magic)) == 0) { + size = sizeof(abis_nm_ipa_magic) + 1; + } else if (omh->data[0] == sizeof(abis_nm_osmo_magic) && + strncmp(abis_nm_osmo_magic, (const char *) omh->data + 1, + sizeof(abis_nm_osmo_magic)) == 0) { type = OML_MSG_TYPE_OSMO; - size = sizeof(oml_osmo_magic) + 1; + size = sizeof(abis_nm_osmo_magic) + 1; } else { LOGP(DL1C, LOGL_ERROR, "Manuf Label Unknown\n"); return -1; |