phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

mobile/mncc_sock.c: ensure MNCC_SOCKET_HELLO message is sent 

This message is used to negotiate MNCC protocol version, and also
in order to make sure that the sutructure alignment is equivalent
for both sides.

Change-Id: I7c5d8aa17540dd61bbe003a6468d97ecea415636
This commit is contained in:
Vadim Yanitskiy 2018-09-29 20:33:00 +07:00
parent 94cb0b3bf7
commit b3c78fa1f7
2 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/host/layer23/include/osmocom/bb/mobile/mncc.h
View File

@ -29,6 +29,8 @@
#include <osmocom/core/linuxlist.h>
#include <osmocom/gsm/mncc.h>
#define MNCC_SOCK_VERSION 5
struct gsm_call {
struct llist_head entry;
@ -111,6 +113,8 @@ struct gsm_call {
#define GSM_TCHH_FRAME 0x0302
#define GSM_TCH_FRAME_AMR 0x0303
#define MNCC_SOCKET_HELLO 0x0400
#define GSM_MAX_FACILITY 128
#define GSM_MAX_SSVERSION 128
#define GSM_MAX_USERUSER 128
@ -173,6 +177,21 @@ struct gsm_data_frame {
unsigned char data[0];
};
struct gsm_mncc_hello {
uint32_t msg_type;
uint32_t version;
/* The sizes of some structures */
uint32_t mncc_size;
uint32_t data_frame_size;
/* Some offsets */
uint32_t called_offset;
uint32_t signal_offset;
uint32_t emergency_offset;
uint32_t lchan_type_offset;
};
const char *get_mncc_name(int value);
int mncc_recv(struct osmocom_ms *ms, int msg_type, void *arg);
void mncc_set_cause(struct gsm_mncc *data, int loc, int val);

35
src/host/layer23/src/mobile/mncc_sock.c
View File

@ -206,6 +206,38 @@ static int mncc_sock_cb(struct osmo_fd *bfd, unsigned int flags)
return rc;
}
/* Send a version indication to the remote */
static void mncc_sock_queue_hello(struct mncc_sock_state *state)
{
struct gsm_mncc_hello *hello;
struct msgb *msg;
msg = msgb_alloc(sizeof(*hello), "MNCC_SOCKET_HELLO");
if (!msg) {
LOGP(DMNCC, LOGL_ERROR, "Failed to allocate MNCC_SOCKET_HELLO\n");
mncc_sock_close(state);
return;
}
/* Put header */
hello = (struct gsm_mncc_hello *) msgb_put(msg, sizeof(*hello));
hello->msg_type = MNCC_SOCKET_HELLO;
hello->version = MNCC_SOCK_VERSION;
/* The sizes of some structures */
hello->mncc_size = sizeof(struct gsm_mncc);
hello->data_frame_size = sizeof(struct gsm_data_frame);
/* Some offsets */
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(&state->upqueue, msg);
state->conn_bfd.when |= BSC_FD_WRITE;
}
/* accept a new connection */
static int mncc_sock_accept(struct osmo_fd *bfd, unsigned int flags)
{
@ -246,6 +278,9 @@ static int mncc_sock_accept(struct osmo_fd *bfd, unsigned int flags)
LOGP(DMNCC, LOGL_NOTICE, "MNCC Socket has connection with external "
"call control application\n");
/* Send HELLO */
mncc_sock_queue_hello(state);
return 0;
}