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/oml.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/oml.c')
| -rw-r--r-- | src/common/oml.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/common/oml.c b/src/common/oml.c index 2d690d63..2ea71ec5 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -91,10 +91,6 @@ static struct tlv_definition abis_nm_att_tlvdef_ipa = { }, }; -/* ip.access nanoBTS specific commands */ -const char oml_ipa_magic[] = "com.ipaccess"; -const char oml_osmo_magic[] = "org.osmocom"; - static int oml_ipa_set_attr(struct gsm_bts *bts, struct msgb *msg); /* @@ -167,9 +163,9 @@ int oml_send_msg(struct msgb *msg, int is_manuf) if (is_manuf) { /* length byte, string + 0 termination */ - uint8_t *manuf = msgb_push(msg, 1 + sizeof(oml_ipa_magic)); - manuf[0] = strlen(oml_ipa_magic)+1; - memcpy(manuf+1, oml_ipa_magic, strlen(oml_ipa_magic)); + uint8_t *manuf = msgb_push(msg, 1 + sizeof(abis_nm_ipa_magic)); + manuf[0] = strlen(abis_nm_ipa_magic)+1; + memcpy(manuf+1, abis_nm_ipa_magic, strlen(abis_nm_ipa_magic)); } /* Push the main OML header and send it off */ @@ -1050,7 +1046,7 @@ static int down_mom(struct gsm_bts *bts, struct msgb *msg) return -EIO; } - if (strncmp((char *)&oh->data[1], oml_ipa_magic, idstrlen)) { + if (strncmp((char *)&oh->data[1], abis_nm_ipa_magic, idstrlen)) { LOGP(DOML, LOGL_ERROR, "Manufacturer OML message != ipaccess not supported\n"); return -EINVAL; } |