cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

mncc: Include size and offsets of struct gsm_mncc in the hello 

Increase the version number and send the sizeof of the gsm_mncc
and the gsm_data_frame structure. Include the offsets of some
members as well to maybe identify ABI problems.

The reason we go through this is that we want to benefit from
the native ABI and don't want to force packed structs.
This commit is contained in:
Holger Hans Peter Freyther 2012-01-15 00:38:35 +01:00
parent c0a6674614
commit 9e7837a14d
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openbsc/include/openbsc/mncc.h
View File

@ -160,10 +160,20 @@ struct gsm_data_frame {
unsigned char data[0];
};
#define MNCC_SOCK_VERSION 1
#define MNCC_SOCK_VERSION 2
struct gsm_mncc_hello {
uint32_t msg_type;
uint32_t version;
/* send the sizes of the structs */
uint32_t mncc_size;
uint32_t data_frame_size;
/* send some offsets */
uint32_t called_offset;
uint32_t signal_offset;
uint32_t emergency_offset;
uint32_t lchan_type_offset;
};
char *get_mncc_name(int value);

7
openbsc/src/libmsc/mncc_sock.c
View File

@ -2,6 +2,7 @@
/* (C) 2008-2010 by Harald Welte <laforge@gnumonks.org>
* (C) 2009 by Andreas Eversberg <Andreas.Eversberg@versatel.de>
* (C) 2012 by Holger Hans Peter Freyther
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@ -221,6 +222,12 @@ static void queue_hello(struct mncc_sock_state *mncc)
hello = (struct gsm_mncc_hello *) msgb_put(msg, sizeof(*hello));
hello->msg_type = MNCC_SOCKET_HELLO;
hello->version = MNCC_SOCK_VERSION;
hello->mncc_size = sizeof(struct gsm_mncc);
hello->data_frame_size = sizeof(struct gsm_data_frame);
hello->called_offset = offsetof(struct gsm_mncc, called);
hello->signal_offset = offsetof(struct gsm_mncc, signal);
hello->emergency_offset = offsetof(struct gsm_mncc, emergency);
hello->lchan_type_offset = offsetof(struct gsm_mncc, lchan_type);
msgb_enqueue(&mncc->net->upqueue, msg);
mncc->conn_bfd.when |= BSC_FD_WRITE;