aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo-bts-sysmo/utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/osmo-bts-sysmo/utils.c')
-rw-r--r--src/osmo-bts-sysmo/utils.c50
1 files changed, 27 insertions, 23 deletions
diff --git a/src/osmo-bts-sysmo/utils.c b/src/osmo-bts-sysmo/utils.c
index 2da1228c..1fa57960 100644
--- a/src/osmo-bts-sysmo/utils.c
+++ b/src/osmo-bts-sysmo/utils.c
@@ -181,33 +181,10 @@ void prepend_oml_ipa_header(struct msgb *msg)
int check_oml_msg(struct msgb *msg)
{
- struct ipaccess_head *hh;
struct abis_om_hdr *omh;
int abis_oml_hdr_len;
char label_id[255];
- if (msg->len < sizeof(struct ipaccess_head)) {
- LOGP(DL1C, LOGL_ERROR, "Ipa header insufficient space %d %d\n",
- msg->len, sizeof(struct ipaccess_head));
- return -1;
- }
-
- hh = (struct ipaccess_head *)msg->data;
-
- if (hh->proto != IPAC_PROTO_OML) {
- LOGP(DL1C, LOGL_ERROR, "Incorrect ipa header protocol %x %x\n",
- hh->proto, IPAC_PROTO_OML);
- return -1;
- }
-
- if (ntohs(hh->len) != msg->len - sizeof(struct ipaccess_head)) {
- LOGP(DL1C, LOGL_ERROR, "Incorrect ipa header msg size %d %d\n",
- ntohs(hh->len), msg->len - sizeof(struct ipaccess_head));
- return -1;
- }
-
- msgb_pull(msg, sizeof(struct ipaccess_head));
-
abis_oml_hdr_len = sizeof(struct abis_om_hdr);
if (msg->len < abis_oml_hdr_len) {
@@ -287,6 +264,33 @@ int check_oml_msg(struct msgb *msg)
return 0;
}
+int check_ipa_header(struct msgb *msg)
+{
+ struct ipaccess_head *hh;
+
+ if (msg->len < sizeof(struct ipaccess_head)) {
+ LOGP(DL1C, LOGL_ERROR, "Ipa header insufficient space %d %d\n",
+ msg->len, sizeof(struct ipaccess_head));
+ return -1;
+ }
+
+ hh = (struct ipaccess_head *)msg->data;
+
+ if (hh->proto != IPAC_PROTO_OML) {
+ LOGP(DL1C, LOGL_ERROR, "Incorrect ipa header protocol %x %x\n",
+ hh->proto, IPAC_PROTO_OML);
+ return -1;
+ }
+
+ if (ntohs(hh->len) != msg->len - sizeof(struct ipaccess_head)) {
+ LOGP(DL1C, LOGL_ERROR, "Incorrect ipa header msg size %d %d\n",
+ ntohs(hh->len), msg->len - sizeof(struct ipaccess_head));
+ return -1;
+ }
+
+ return 0;
+}
+
int add_manufacturer_id_label(struct msgb *msg, int manuf_type_id)
{
uint8_t *manuf;