Make LCR work with the current openbsc lcr_rtp branch. (soon merged with master branch)
[lcr.git] / gsm.cpp
diff --git a/gsm.cpp b/gsm.cpp
index 663fab5..b1895f8 100644 (file)
--- a/gsm.cpp
+++ b/gsm.cpp
 \*****************************************************************************/ 
 
 #include "main.h"
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 extern "C" {
-#include "openbsc/gsm_data.h"
-#include "openbsc/mncc.h"
-#include "openbsc/trau_frame.h"
-#include "openbsc/select.h"
-#include "openbsc/debug.h"
-#include "bootstrap.h"
+#include <getopt.h>
+
+#include <openbsc/db.h>
+#include <openbsc/select.h>
+#include <openbsc/debug.h>
+#include <openbsc/e1_input.h>
+#include <openbsc/talloc.h>
+#include <openbsc/mncc.h>
+#include <openbsc/trau_frame.h>
+struct gsm_network *bsc_gsmnet = 0;
+extern int ipacc_rtp_direct;
+extern int bsc_bootstrap_network(int (*mmc_rev)(struct gsm_network *, int, void *),
+                                const char *cfg_file);
+extern int bsc_shutdown_net(struct gsm_network *net);
+void talloc_ctx_init(void);
+void on_dso_load_token(void);
+void on_dso_load_rrlp(void);
+
 #include "gsm_audio.h"
 
 #undef AF_ISDN
@@ -25,6 +41,7 @@ extern  int     AF_ISDN;
 #define PF_ISDN AF_ISDN
 }
 
+
 struct lcr_gsm *gsm = NULL;
 
 static unsigned int new_callref = 1;
@@ -168,9 +185,7 @@ int Pgsm::bchannel_open(int index)
 /* receive from bchannel */
 void Pgsm::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len)
 {
-       int i, j, k;
        unsigned char frame[33];
-       struct decoded_trau_frame tf;
 
        /* encoder init failed */
        if (!p_m_g_encoder)
@@ -188,31 +203,7 @@ void Pgsm::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len)
 
                        /* encode data */
                        gsm_audio_encode(p_m_g_encoder, p_m_g_rxdata, frame);
-
-                       /* set c-bits and t-bits */
-                       tf.c_bits[0] = 1;
-                       tf.c_bits[1] = 1;
-                       tf.c_bits[2] = 1;
-                       tf.c_bits[3] = 0;
-                       tf.c_bits[4] = 0;
-                       memset(&tf.c_bits[5], 0, 6);
-                       memset(&tf.c_bits[11], 1, 10);
-                       memset(&tf.t_bits[0], 1, 4);
-
-                       /* reassemble d-bits */
-                       i = 0;
-                       j = 0;
-                       k = 0;
-                       while(i < 260) {
-                               tf.d_bits[i] = (frame[j] >> k) & 1;
-                               if (++k == 8) {
-                                       k = 0;
-                                       j++;
-                               }
-                               i++;
-                       }
-
-                       trau_send(&tf);
+                       frame_send(frame);
                }
        }
 }
@@ -236,57 +227,33 @@ void Pgsm::bchannel_send(unsigned int prim, unsigned int id, unsigned char *data
                PERROR("Failed to send to socket index %d\n", index);
 }
 
-void Pgsm::trau_send(void *_tf)
+void Pgsm::frame_send(void *_frame)
 {
-       struct decoded_trau_frame *tf = (struct decoded_trau_frame *)_tf;
-       unsigned char data[sizeof(struct gsm_trau_frame) + sizeof(struct decoded_trau_frame)];
-       struct gsm_trau_frame *frame = (struct gsm_trau_frame *)data;
+       unsigned char buffer[sizeof(struct gsm_data_frame) + 33];
+       struct gsm_data_frame *frame = (struct gsm_data_frame *)buffer;
        
-       frame->msg_type = GSM_TRAU_FRAME;
+       frame->msg_type = GSM_TCHF_FRAME;
        frame->callref = p_m_g_callref;
-       memcpy(frame->data, tf, sizeof(struct decoded_trau_frame));
+       memcpy(frame->data, _frame, 33);
        mncc_send((struct gsm_network *)gsm->network, frame->msg_type, frame);
 }
 
 
-void Pgsm::trau_receive(void *_frame)
+void Pgsm::frame_receive(void *_frame)
 {
-       struct gsm_trau_frame *frm = (struct gsm_trau_frame *)_frame;
-       struct decoded_trau_frame *tf = (struct decoded_trau_frame *)frm->data;
-//struct decoded_trau_frame *tf = (struct decoded_trau_frame *)_frame;
-       unsigned char frame[33];
+       struct gsm_data_frame *frame = (struct gsm_data_frame *)_frame;
        signed short samples[160];
        unsigned char data[160];
-       int i, j, k;
+       int i;
 
        if (!p_m_g_decoder)
                return;
 
-//     printf("got trau %d %d %d %d %d\n", tf->c_bits[0], tf->c_bits[1], tf->c_bits[2], tf->c_bits[3], tf->c_bits[4]);
-       if (tf->c_bits[0]!=0 || tf->c_bits[1]!=0 || tf->c_bits[2]!=0 || tf->c_bits[3]!=1 || tf->c_bits[4]!=0)
-               PERROR("illegal trau (C1-C5) %d %d %d %d %d\n", tf->c_bits[0], tf->c_bits[1], tf->c_bits[2], tf->c_bits[3], tf->c_bits[4]);
-
-       /* set GSM_MAGIC */
-       memset(&frame, 0, sizeof(frame));
-//     frame[0] = 0xd << 4;
-
-       /* reassemble bits */
-       i = 0;
-       j = 0;
-       k = 0;
-       while(i < 260) {
-               if (tf->d_bits[i] > 1)
-                       PERROR("fix!\n");
-               frame[j] |= (tf->d_bits[i] << k);
-               if (++k == 8) {
-                       k = 0;
-                       j++;
-               }
-               i++;
-       }
+       if ((frame->data[0]>>4) != 0xd)
+               PERROR("received GSM frame with wrong magig 0x%x\n", frame->data[0]>>4);
        
        /* decode */
-       gsm_audio_decode(p_m_g_decoder, frame, samples);
+       gsm_audio_decode(p_m_g_decoder, frame->data, samples);
        for (i = 0; i < 160; i++) {
                data[i] = audio_s16_to_law[samples[i] & 0xffff];
        }
@@ -395,13 +362,13 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
                end_trace();
                mncc = create_mncc(MNCC_REJ_REQ, callref);
                gsm_trace_header(p_m_mISDNport, this, MNCC_REJ_REQ, DIRECTION_OUT);
-               mncc->cause = 1;
-               mncc->cause_coding = 3;
-               mncc->cause_location = 1;
-               mncc->cause_value = 47;
-               add_trace("cause", "coding", "%d", mncc->cause_coding);
-               add_trace("cause", "location", "%d", mncc->cause_location);
-               add_trace("cause", "value", "%d", mncc->cause_value);
+               mncc->fields |= MNCC_F_CAUSE;
+               mncc->cause.coding = 3;
+               mncc->cause.location = 1;
+               mncc->cause.value = 47;
+               add_trace("cause", "coding", "%d", mncc->cause.coding);
+               add_trace("cause", "location", "%d", mncc->cause.location);
+               add_trace("cause", "value", "%d", mncc->cause.value);
                add_trace("reason", NULL, "callref already in use");
                end_trace();
                send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
@@ -416,13 +383,13 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        if (p_m_mISDNport->ifport->block) {
                mncc = create_mncc(MNCC_REJ_REQ, p_m_g_callref);
                gsm_trace_header(p_m_mISDNport, this, MNCC_REJ_REQ, DIRECTION_OUT);
-               mncc->cause = 1;
-               mncc->cause_coding = 3;
-               mncc->cause_location = 1;
-               mncc->cause_value = 27;
-               add_trace("cause", "coding", "%d", mncc->cause_coding);
-               add_trace("cause", "location", "%d", mncc->cause_location);
-               add_trace("cause", "value", "%d", mncc->cause_value);
+               mncc->fields |= MNCC_F_CAUSE;
+               mncc->cause.coding = 3;
+               mncc->cause.location = 1;
+               mncc->cause.value = 27;
+               add_trace("cause", "coding", "%d", mncc->cause.coding);
+               add_trace("cause", "location", "%d", mncc->cause.location);
+               add_trace("cause", "value", "%d", mncc->cause.value);
                add_trace("reason", NULL, "port is blocked");
                end_trace();
                send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
@@ -432,22 +399,23 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        }
 
        /* caller info */
-       if (mncc->clir_inv)
+       if (mncc->clir.inv)
                p_callerinfo.present = INFO_PRESENT_RESTRICTED;
        else
                p_callerinfo.present = INFO_PRESENT_ALLOWED;
-       if (mncc->calling_number[0])
-               SCPY(p_callerinfo.id, mncc->calling_number);
+       if (mncc->calling.number[0])
+               SCPY(p_callerinfo.id, mncc->calling.number);
        else
                p_callerinfo.present = INFO_PRESENT_NOTAVAIL;
+       SCPY(p_callerinfo.imsi, mncc->imsi);
        p_callerinfo.screen = INFO_SCREEN_NETWORK;
        p_callerinfo.ntype = INFO_NTYPE_UNKNOWN;
        p_callerinfo.isdn_port = p_m_portnum;
        SCPY(p_callerinfo.interface, p_m_mISDNport->ifport->interface->name);
 
        /* dialing information */
-       SCAT(p_dialinginfo.id, mncc->called_number);
-       switch (mncc->called_type) {
+       SCAT(p_dialinginfo.id, mncc->called.number);
+       switch (mncc->called.type) {
                case 0x1:
                p_dialinginfo.ntype = INFO_NTYPE_INTERNATIONAL;
                break;
@@ -487,13 +455,13 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
                no_channel:
                mncc = create_mncc(MNCC_REJ_REQ, p_m_g_callref);
                gsm_trace_header(p_m_mISDNport, this, MNCC_REJ_REQ, DIRECTION_OUT);
-               mncc->cause = 1;
-               mncc->cause_coding = 3;
-               mncc->cause_location = 1;
-               mncc->cause_value = 34;
-               add_trace("cause", "coding", "%d", mncc->cause_coding);
-               add_trace("cause", "location", "%d", mncc->cause_location);
-               add_trace("cause", "value", "%d", mncc->cause_value);
+               mncc->fields |= MNCC_F_CAUSE;
+               mncc->cause.coding = 3;
+               mncc->cause.location = 1;
+               mncc->cause.value = 34;
+               add_trace("cause", "coding", "%d", mncc->cause.coding);
+               add_trace("cause", "location", "%d", mncc->cause.location);
+               add_trace("cause", "value", "%d", mncc->cause.value);
                add_trace("reason", NULL, "no channel");
                end_trace();
                send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
@@ -507,7 +475,11 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
 
        /* what infos did we got ... */
        gsm_trace_header(p_m_mISDNport, this, msg_type, DIRECTION_IN);
-       add_trace("subscr", "number", "%s", p_callerinfo.id);
+       if (p_callerinfo.id[0])
+               add_trace("calling", "number", "%s", p_callerinfo.id);
+       else
+               SPRINT(p_callerinfo.id, "imsi-%s", p_callerinfo.imsi);
+       add_trace("calling", "imsi", "%s", p_callerinfo.imsi);
        add_trace("dialing", "number", "%s", p_dialinginfo.id);
        end_trace();
 
@@ -532,13 +504,13 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        gsm_trace_header(p_m_mISDNport, this, MNCC_CALL_PROC_REQ, DIRECTION_OUT);
        proceeding = create_mncc(MNCC_CALL_PROC_REQ, p_m_g_callref);
        if (p_m_mISDNport->tones) {
-               proceeding->progress = 1;
-               proceeding->progress_coding = 3; /* GSM */
-               proceeding->progress_location = 1;
-               proceeding->progress_descr = 8;
-               add_trace("progress", "coding", "%d", proceeding->progress_coding);
-               add_trace("progress", "location", "%d", proceeding->progress_location);
-               add_trace("progress", "descr", "%d", proceeding->progress_descr);
+               proceeding->fields |= MNCC_F_PROGRESS;
+               proceeding->progress.coding = 3; /* GSM */
+               proceeding->progress.location = 1;
+               proceeding->progress.descr = 8;
+               add_trace("progress", "coding", "%d", proceeding->progress.coding);
+               add_trace("progress", "location", "%d", proceeding->progress.location);
+               add_trace("progress", "descr", "%d", proceeding->progress.descr);
        }
        end_trace();
        send_and_free_mncc((struct gsm_network *)gsm->network, proceeding->msg_type, proceeding);
@@ -561,9 +533,9 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        memcpy(&message->param.setup.dialinginfo, &p_dialinginfo, sizeof(struct dialing_info));
        memcpy(&message->param.setup.callerinfo, &p_callerinfo, sizeof(struct caller_info));
        memcpy(&message->param.setup.capainfo, &p_capainfo, sizeof(struct capa_info));
-       SCPY((char *)message->param.setup.useruser.data, (char *)mncc->useruser_info);
-       message->param.setup.useruser.len = strlen(mncc->useruser_info);
-       message->param.setup.useruser.protocol = mncc->useruser_proto;
+       SCPY((char *)message->param.setup.useruser.data, (char *)mncc->useruser.info);
+       message->param.setup.useruser.len = strlen(mncc->useruser.info);
+       message->param.setup.useruser.protocol = mncc->useruser.proto;
        message_put(message);
 }
 
@@ -615,10 +587,10 @@ void Pgsm::call_conf_ind(unsigned int msg_type, unsigned int callref, struct gsm
        struct gsm_mncc *mode;
 
        gsm_trace_header(p_m_mISDNport, this, msg_type, DIRECTION_IN);
-       if (mncc->cause) {
-               add_trace("cause", "coding", "%d", mncc->cause_coding);
-               add_trace("cause", "location", "%", mncc->cause_location);
-               add_trace("cause", "value", "%", mncc->cause_value);
+       if (mncc->fields & MNCC_F_CAUSE) {
+               add_trace("cause", "coding", "%d", mncc->cause.coding);
+               add_trace("cause", "location", "%", mncc->cause.location);
+               add_trace("cause", "value", "%", mncc->cause.value);
        }
        end_trace();
 
@@ -653,7 +625,21 @@ void Pgsm::setup_cnf(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        struct gsm_mncc *resp, *frame;
        struct lcr_msg *message;
 
+       SCPY(p_connectinfo.id, mncc->connected.number);
+       SCPY(p_connectinfo.imsi, mncc->imsi);
+       p_connectinfo.present = INFO_PRESENT_ALLOWED;
+       p_connectinfo.screen = INFO_SCREEN_NETWORK;
+       p_connectinfo.ntype = INFO_NTYPE_UNKNOWN;
+       p_connectinfo.isdn_port = p_m_portnum;
+       SCPY(p_connectinfo.interface, p_m_mISDNport->ifport->interface->name);
+
        gsm_trace_header(p_m_mISDNport, this, msg_type, DIRECTION_IN);
+       if (p_connectinfo.id[0])
+               add_trace("connect", "number", "%s", p_connectinfo.id);
+       else if (mncc->imsi[0])
+               SPRINT(p_connectinfo.id, "imsi-%s", p_connectinfo.imsi);
+       if (mncc->imsi[0])
+               add_trace("connect", "imsi", "%s", p_connectinfo.imsi);
        end_trace();
 
        /* send resp */
@@ -663,6 +649,7 @@ void Pgsm::setup_cnf(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        send_and_free_mncc((struct gsm_network *)gsm->network, resp->msg_type, resp);
 
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CONNECT);
+       memcpy(&message->param.connectinfo, &p_connectinfo, sizeof(struct connect_info));
        message_put(message);
 
        new_state(PORT_STATE_CONNECT);
@@ -703,10 +690,10 @@ void Pgsm::disc_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
        struct gsm_mncc *resp;
 
        gsm_trace_header(p_m_mISDNport, this, msg_type, DIRECTION_IN);
-       if (mncc->cause) {
-               location = mncc->cause_location;
-               cause = mncc->cause_value;
-               add_trace("cause", "coding", "%d", mncc->cause_coding);
+       if (mncc->fields & MNCC_F_CAUSE) {
+               location = mncc->cause.location;
+               cause = mncc->cause.value;
+               add_trace("cause", "coding", "%d", mncc->cause.coding);
                add_trace("cause", "location", "%d", location);
                add_trace("cause", "value", "%d", cause);
        }
@@ -716,13 +703,13 @@ void Pgsm::disc_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
        resp = create_mncc(MNCC_REL_REQ, p_m_g_callref);
        gsm_trace_header(p_m_mISDNport, this, MNCC_REL_REQ, DIRECTION_OUT);
 #if 0
-       resp->cause = 1;
-       resp->cause_coding = 3;
-       resp->cause_location = 1;
-       resp->cause_value = cause;
-       add_trace("cause", "coding", "%d", resp->cause_coding);
-       add_trace("cause", "location", "%d", resp->cause_location);
-       add_trace("cause", "value", "%d", resp->cause_value);
+       resp->fields |= MNCC_F_CAUSE;
+       resp->cause.coding = 3;
+       resp->cause.location = 1;
+       resp->cause.value = cause;
+       add_trace("cause", "coding", "%d", resp->cause.coding);
+       add_trace("cause", "location", "%d", resp->cause.location);
+       add_trace("cause", "value", "%d", resp->cause.value);
 #endif
        end_trace();
        send_and_free_mncc((struct gsm_network *)gsm->network, resp->msg_type, resp);
@@ -747,12 +734,12 @@ void Pgsm::rel_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
        struct lcr_msg *message;
 
        gsm_trace_header(p_m_mISDNport, this, msg_type, DIRECTION_IN);
-       if (mncc->cause) {
-               location = mncc->cause_location;
-               cause = mncc->cause_value;
-               add_trace("cause", "coding", "%d", mncc->cause_coding);
-               add_trace("cause", "location", "%d", mncc->cause_location);
-               add_trace("cause", "value", "%d", mncc->cause_value);
+       if (mncc->fields & MNCC_F_CAUSE) {
+               location = mncc->cause.location;
+               cause = mncc->cause.value;
+               add_trace("cause", "coding", "%d", mncc->cause.coding);
+               add_trace("cause", "location", "%d", mncc->cause.location);
+               add_trace("cause", "value", "%d", mncc->cause.value);
        }
        end_trace();
 
@@ -843,7 +830,7 @@ void Pgsm::retr_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
 /*
  * BSC sends message to port
  */
-static int message_bcs(struct gsm_network *net, int msg_type, void *arg)
+static int message_bsc(struct gsm_network *net, int msg_type, void *arg)
 {
        struct gsm_mncc *mncc = (struct gsm_mncc *)arg;
        unsigned int callref = mncc->callref;
@@ -869,9 +856,9 @@ static int message_bcs(struct gsm_network *net, int msg_type, void *arg)
                port = port->next;
        }
 
-       if (msg_type == GSM_TRAU_FRAME) {
+       if (msg_type == GSM_TCHF_FRAME) {
                if (port)
-                       pgsm->trau_receive((struct gsm_trau_frame *)arg);
+                       pgsm->frame_receive((struct gsm_trau_frame *)arg);
                return 0;
        }
 
@@ -889,14 +876,14 @@ static int message_bcs(struct gsm_network *net, int msg_type, void *arg)
                        struct gsm_mncc *rej;
 
                        rej = create_mncc(MNCC_REJ_REQ, callref);
-                       rej->cause = 1;
-                       rej->cause_coding = 3;
-                       rej->cause_location = 1;
-                       rej->cause_value = 27;
+                       rej->fields |= MNCC_F_CAUSE;
+                       rej->cause.coding = 3;
+                       rej->cause.location = 1;
+                       rej->cause.value = 27;
                        gsm_trace_header(NULL, NULL, MNCC_REJ_REQ, DIRECTION_OUT);
-                       add_trace("cause", "coding", "%d", rej->cause_coding);
-                       add_trace("cause", "location", "%d", rej->cause_location);
-                       add_trace("cause", "value", "%d", rej->cause_value);
+                       add_trace("cause", "coding", "%d", rej->cause.coding);
+                       add_trace("cause", "location", "%d", rej->cause.location);
+                       add_trace("cause", "value", "%d", rej->cause.value);
                        end_trace();
                        send_and_free_mncc((struct gsm_network *)gsm->network, rej->msg_type, rej);
                        return 0;
@@ -1054,106 +1041,111 @@ void Pgsm::message_setup(unsigned int epoint_id, int message_id, union parameter
        gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_REQ, DIRECTION_OUT);
        mncc = create_mncc(MNCC_SETUP_REQ, p_m_g_callref);
        /* caller information */
-       mncc->calling = 1;
-       mncc->calling_plan = 1;
+       mncc->fields |= MNCC_F_CALLING;
+       mncc->calling.plan = 1;
        switch (p_callerinfo.ntype) {
                case INFO_NTYPE_UNKNOWN:
-               mncc->calling_type = 0x0;
+               mncc->calling.type = 0x0;
                break;
                case INFO_NTYPE_INTERNATIONAL:
-               mncc->calling_type = 0x1;
+               mncc->calling.type = 0x1;
                break;
                case INFO_NTYPE_NATIONAL:
-               mncc->calling_type = 0x2;
+               mncc->calling.type = 0x2;
                break;
                case INFO_NTYPE_SUBSCRIBER:
-               mncc->calling_type = 0x4;
+               mncc->calling.type = 0x4;
                break;
                default: /* INFO_NTYPE_NOTPRESENT */
-               mncc->calling = 0;
+               mncc->fields &= ~MNCC_F_CALLING;
                break;
        }
        switch (p_callerinfo.screen) {
                case INFO_SCREEN_USER:
-               mncc->calling_screen = 0;
+               mncc->calling.screen = 0;
                break;
                default: /* INFO_SCREEN_NETWORK */
-               mncc->calling_screen = 3;
+               mncc->calling.screen = 3;
                break;
        }
        switch (p_callerinfo.present) {
                case INFO_PRESENT_ALLOWED:
-               mncc->calling_present = 0;
+               mncc->calling.present = 0;
                break;
                case INFO_PRESENT_RESTRICTED:
-               mncc->calling_present = 1;
+               mncc->calling.present = 1;
                break;
                default: /* INFO_PRESENT_NOTAVAIL */
-               mncc->calling_present = 2;
+               mncc->calling.present = 2;
                break;
        }
-       if (mncc->calling) {
-               SCPY(mncc->calling_number, p_callerinfo.id);
-               add_trace("calling", "type", "%d", mncc->calling_type);
-               add_trace("calling", "plan", "%d", mncc->calling_plan);
-               add_trace("calling", "present", "%d", mncc->calling_present);
-               add_trace("calling", "screen", "%d", mncc->calling_screen);
-               add_trace("calling", "number", "%s", mncc->calling_number);
+       if (mncc->fields & MNCC_F_CALLING) {
+               SCPY(mncc->calling.number, p_callerinfo.id);
+               add_trace("calling", "type", "%d", mncc->calling.type);
+               add_trace("calling", "plan", "%d", mncc->calling.plan);
+               add_trace("calling", "present", "%d", mncc->calling.present);
+               add_trace("calling", "screen", "%d", mncc->calling.screen);
+               add_trace("calling", "number", "%s", mncc->calling.number);
        }
        /* dialing information */
-       mncc->called = 1;
-       SCPY(mncc->called_number, p_dialinginfo.id);
-       add_trace("dialing", "number", "%s", mncc->called_number);
+       mncc->fields |= MNCC_F_CALLED;
+       if (!strncmp(p_dialinginfo.id, "imsi-", 5)) {
+               SCPY(mncc->imsi, p_dialinginfo.id+5);
+               add_trace("dialing", "imsi", "%s", mncc->imsi);
+       } else {
+               SCPY(mncc->called.number, p_dialinginfo.id);
+               add_trace("dialing", "number", "%s", mncc->called.number);
+       }
        
        /* sending user-user */
 
        /* redirecting number */
-       mncc->redirecting = 1;
-       mncc->redirecting_plan = 1;
+       mncc->fields |= MNCC_F_REDIRECTING;
+       mncc->redirecting.plan = 1;
        switch (p_redirinfo.ntype) {
                case INFO_NTYPE_UNKNOWN:
-               mncc->redirecting_type = 0x0;
+               mncc->redirecting.type = 0x0;
                break;
                case INFO_NTYPE_INTERNATIONAL:
-               mncc->redirecting_type = 0x1;
+               mncc->redirecting.type = 0x1;
                break;
                case INFO_NTYPE_NATIONAL:
-               mncc->redirecting_type = 0x2;
+               mncc->redirecting.type = 0x2;
                break;
                case INFO_NTYPE_SUBSCRIBER:
-               mncc->redirecting_type = 0x4;
+               mncc->redirecting.type = 0x4;
                break;
                default: /* INFO_NTYPE_NOTPRESENT */
-               mncc->redirecting = 0;
+               mncc->fields &= ~MNCC_F_REDIRECTING;
                break;
        }
        switch (p_redirinfo.screen) {
                case INFO_SCREEN_USER:
-               mncc->redirecting_screen = 0;
+               mncc->redirecting.screen = 0;
                break;
                default: /* INFO_SCREE_NETWORK */
-               mncc->redirecting_screen = 3;
+               mncc->redirecting.screen = 3;
                break;
        }
        switch (p_redirinfo.present) {
                case INFO_PRESENT_ALLOWED:
-               mncc->redirecting_present = 0;
+               mncc->redirecting.present = 0;
                break;
                case INFO_PRESENT_RESTRICTED:
-               mncc->redirecting_present = 1;
+               mncc->redirecting.present = 1;
                break;
                default: /* INFO_PRESENT_NOTAVAIL */
-               mncc->redirecting_present = 2;
+               mncc->redirecting.present = 2;
                break;
        }
        /* sending redirecting number only in ntmode */
-       if (mncc->redirecting) {
-               SCPY(mncc->redirecting_number, p_redirinfo.id);
-               add_trace("redir", "type", "%d", mncc->redirecting_type);
-               add_trace("redir", "plan", "%d", mncc->redirecting_plan);
-               add_trace("redir", "present", "%d", mncc->redirecting_present);
-               add_trace("redir", "screen", "%d", mncc->redirecting_screen);
-               add_trace("redir", "number", "%s", mncc->redirecting_number);
+       if (mncc->fields & MNCC_F_REDIRECTING) {
+               SCPY(mncc->redirecting.number, p_redirinfo.id);
+               add_trace("redir", "type", "%d", mncc->redirecting.type);
+               add_trace("redir", "plan", "%d", mncc->redirecting.plan);
+               add_trace("redir", "present", "%d", mncc->redirecting.present);
+               add_trace("redir", "screen", "%d", mncc->redirecting.screen);
+               add_trace("redir", "number", "%s", mncc->redirecting.number);
        }
        /* bearer capability */
        //todo
@@ -1175,7 +1167,7 @@ void Pgsm::message_notify(unsigned int epoint_id, int message_id, union paramete
        struct gsm_mncc *mncc;
        int notify;
 
-       printf("if = %d\n", param->notifyinfo.notify);
+//     printf("if = %d\n", param->notifyinfo.notify);
        if (param->notifyinfo.notify>INFO_NOTIFY_NONE) {
                notify = param->notifyinfo.notify & 0x7f;
                if (p_state!=PORT_STATE_CONNECT /*&& p_state!=PORT_STATE_IN_PROCEEDING*/ && p_state!=PORT_STATE_IN_ALERTING) {
@@ -1205,13 +1197,13 @@ void Pgsm::message_alerting(unsigned int epoint_id, int message_id, union parame
        gsm_trace_header(p_m_mISDNport, this, MNCC_ALERT_REQ, DIRECTION_OUT);
        mncc = create_mncc(MNCC_ALERT_REQ, p_m_g_callref);
        if (p_m_mISDNport->tones) {
-               mncc->progress = 1;
-               mncc->progress_coding = 3; /* GSM */
-               mncc->progress_location = 1;
-               mncc->progress_descr = 8;
-               add_trace("progress", "coding", "%d", mncc->progress_coding);
-               add_trace("progress", "location", "%d", mncc->progress_location);
-               add_trace("progress", "descr", "%d", mncc->progress_descr);
+               mncc->fields |= MNCC_F_PROGRESS;
+               mncc->progress.coding = 3; /* GSM */
+               mncc->progress.location = 1;
+               mncc->progress.descr = 8;
+               add_trace("progress", "coding", "%d", mncc->progress.coding);
+               add_trace("progress", "location", "%d", mncc->progress.location);
+               add_trace("progress", "descr", "%d", mncc->progress.descr);
        }
        end_trace();
        send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
@@ -1241,51 +1233,51 @@ void Pgsm::message_connect(unsigned int epoint_id, int message_id, union paramet
        mncc = create_mncc(MNCC_SETUP_RSP, p_m_g_callref);
        gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_RSP, DIRECTION_OUT);
        /* caller information */
-       mncc->connected = 1;
-       mncc->connected_plan = 1;
+       mncc->fields |= MNCC_F_CONNECTED;
+       mncc->connected.plan = 1;
        switch (p_callerinfo.ntype) {
                case INFO_NTYPE_UNKNOWN:
-               mncc->connected_type = 0x0;
+               mncc->connected.type = 0x0;
                break;
                case INFO_NTYPE_INTERNATIONAL:
-               mncc->connected_type = 0x1;
+               mncc->connected.type = 0x1;
                break;
                case INFO_NTYPE_NATIONAL:
-               mncc->connected_type = 0x2;
+               mncc->connected.type = 0x2;
                break;
                case INFO_NTYPE_SUBSCRIBER:
-               mncc->connected_type = 0x4;
+               mncc->connected.type = 0x4;
                break;
                default: /* INFO_NTYPE_NOTPRESENT */
-               mncc->connected = 0;
+               mncc->fields &= ~MNCC_F_CONNECTED;
                break;
        }
        switch (p_callerinfo.screen) {
                case INFO_SCREEN_USER:
-               mncc->connected_screen = 0;
+               mncc->connected.screen = 0;
                break;
                default: /* INFO_SCREEN_NETWORK */
-               mncc->connected_screen = 3;
+               mncc->connected.screen = 3;
                break;
        }
        switch (p_callerinfo.present) {
                case INFO_PRESENT_ALLOWED:
-               mncc->connected_present = 0;
+               mncc->connected.present = 0;
                break;
                case INFO_PRESENT_RESTRICTED:
-               mncc->connected_present = 1;
+               mncc->connected.present = 1;
                break;
                default: /* INFO_PRESENT_NOTAVAIL */
-               mncc->connected_present = 2;
+               mncc->connected.present = 2;
                break;
        }
-       if (mncc->connected) {
-               SCPY(mncc->connected_number, p_connectinfo.id);
-               add_trace("connected", "type", "%d", mncc->connected_type);
-               add_trace("connected", "plan", "%d", mncc->connected_plan);
-               add_trace("connected", "present", "%d", mncc->connected_present);
-               add_trace("connected", "screen", "%d", mncc->connected_screen);
-               add_trace("connected", "number", "%s", mncc->connected_number);
+       if (mncc->fields & MNCC_F_CONNECTED) {
+               SCPY(mncc->connected.number, p_connectinfo.id);
+               add_trace("connected", "type", "%d", mncc->connected.type);
+               add_trace("connected", "plan", "%d", mncc->connected.plan);
+               add_trace("connected", "present", "%d", mncc->connected.present);
+               add_trace("connected", "screen", "%d", mncc->connected.screen);
+               add_trace("connected", "number", "%s", mncc->connected.number);
        }
        end_trace();
        send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
@@ -1302,21 +1294,21 @@ void Pgsm::message_disconnect(unsigned int epoint_id, int message_id, union para
        mncc = create_mncc(MNCC_DISC_REQ, p_m_g_callref);
        gsm_trace_header(p_m_mISDNport, this, MNCC_DISC_REQ, DIRECTION_OUT);
        if (p_m_mISDNport->tones) {
-               mncc->progress = 1;
-               mncc->progress_coding = 3; /* GSM */
-               mncc->progress_location = 1;
-               mncc->progress_descr = 8;
-               add_trace("progress", "coding", "%d", mncc->progress_coding);
-               add_trace("progress", "location", "%d", mncc->progress_location);
-               add_trace("progress", "descr", "%d", mncc->progress_descr);
-       }
-       mncc->cause = 1;
-       mncc->cause_coding = 3;
-       mncc->cause_location = param->disconnectinfo.location;
-       mncc->cause_value = param->disconnectinfo.cause;
-       add_trace("cause", "coding", "%d", mncc->cause_coding);
-       add_trace("cause", "location", "%d", mncc->cause_location);
-       add_trace("cause", "value", "%d", mncc->cause_value);
+               mncc->fields |= MNCC_F_PROGRESS;
+               mncc->progress.coding = 3; /* GSM */
+               mncc->progress.location = 1;
+               mncc->progress.descr = 8;
+               add_trace("progress", "coding", "%d", mncc->progress.coding);
+               add_trace("progress", "location", "%d", mncc->progress.location);
+               add_trace("progress", "descr", "%d", mncc->progress.descr);
+       }
+       mncc->fields |= MNCC_F_CAUSE;
+       mncc->cause.coding = 3;
+       mncc->cause.location = param->disconnectinfo.location;
+       mncc->cause.value = param->disconnectinfo.cause;
+       add_trace("cause", "coding", "%d", mncc->cause.coding);
+       add_trace("cause", "location", "%d", mncc->cause.location);
+       add_trace("cause", "value", "%d", mncc->cause.value);
        end_trace();
        send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 
@@ -1340,13 +1332,13 @@ void Pgsm::message_release(unsigned int epoint_id, int message_id, union paramet
        /* send release */
        mncc = create_mncc(MNCC_REL_REQ, p_m_g_callref);
        gsm_trace_header(p_m_mISDNport, this, MNCC_REL_REQ, DIRECTION_OUT);
-       mncc->cause = 1;
-       mncc->cause_coding = 3;
-       mncc->cause_location = param->disconnectinfo.location;
-       mncc->cause_value = param->disconnectinfo.cause;
-       add_trace("cause", "coding", "%d", mncc->cause_coding);
-       add_trace("cause", "location", "%d", mncc->cause_location);
-       add_trace("cause", "value", "%d", mncc->cause_value);
+       mncc->fields |= MNCC_F_CAUSE;
+       mncc->cause.coding = 3;
+       mncc->cause.location = param->disconnectinfo.location;
+       mncc->cause.value = param->disconnectinfo.cause;
+       add_trace("cause", "coding", "%d", mncc->cause.coding);
+       add_trace("cause", "location", "%d", mncc->cause.location);
+       add_trace("cause", "value", "%d", mncc->cause.value);
        end_trace();
        send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 
@@ -1581,11 +1573,11 @@ int gsm_exit(int rc)
                        gsm_sock_close();
                /* shutdown network */
                if (gsm->network)
-                       shutdown_net((struct gsm_network *)gsm->network);
+                       bsc_shutdown_net((struct gsm_network *)gsm->network);
                /* free network */
-               if (gsm->network) {
-                       free((struct gsm_network *)gsm->network); /* TBD */
-               }
+//             if (gsm->network) {
+//                     free((struct gsm_network *)gsm->network); /* TBD */
+//             }
                free(gsm);
                gsm = NULL;
        }
@@ -1595,7 +1587,17 @@ int gsm_exit(int rc)
 
 int gsm_init(void)
 {
-       char hlr[128];
+       char hlr[128], cfg[128], filename[128];
+        mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
+       int pcapfd, rc;
+
+       tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc");
+       talloc_ctx_init();
+       on_dso_load_token();
+       on_dso_load_rrlp();
+
+       /* seed the PRNG */
+       srand(time(NULL));
 
        /* create gsm instance */
        gsm = (struct lcr_gsm *)MALLOC(sizeof(struct lcr_gsm));
@@ -1608,25 +1610,58 @@ int gsm_init(void)
        }
 
        /* set debug */
-       debug_parse_category_mask(gsm->conf.debug);
+       if (gsm->conf.debug[0])
+               debug_parse_category_mask(gsm->conf.debug);
+
+       /* open pcap file */
+       if (gsm->conf.pcapfile[0]) {
+               if (gsm->conf.pcapfile[0] == '/')
+                       SCPY(filename, gsm->conf.pcapfile);
+               else
+                       SPRINT(filename, "%s/%s", CONFIG_DATA, gsm->conf.pcapfile);
+               pcapfd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, mode);
+               if (pcapfd < 0) {
+                       PERROR("Failed to open file for pcap\n");
+                       return gsm_exit(-1);
+               }
+               e1_set_pcap_fd(pcapfd);
+       }
+
+       /* use RTP proxy for audio streaming */
+       ipacc_rtp_direct = 0;
 
        /* init database */
        if (gsm->conf.hlr[0] == '/')
                SCPY(hlr, gsm->conf.hlr);
        else
                SPRINT(hlr, "%s/%s", CONFIG_DATA, gsm->conf.hlr);
-
-       // TODO multiple base stations
-       if (gsm->conf.numbts < 1 || gsm->conf.numbts > 1) {
-               PERROR("Expecting exactly one BTS. You defined %d.\n", gsm->conf.numbts);
+       if (db_init(hlr)) {
+               PERROR("GSM DB: Failed to init database '%s'. Please check the option settings.\n", hlr);
+               return gsm_exit(-1);
+       }
+       printf("DB: Database initialized.\n");
+       if (db_prepare()) {
+               PERROR("GSM DB: Failed to prepare database.\n");
                return gsm_exit(-1);
        }
+       printf("DB: Database prepared.\n");
+
        /* bootstrap network */
-       gsm->network = bootstrap_network(&message_bcs, gsm->conf.bts[0].type, gsm->conf.mcc, gsm->conf.mnc, gsm->conf.lac, gsm->conf.bts[0].frequency[0], gsm->conf.bts[0].card, !gsm->conf.keep_l2, gsm->conf.short_name, gsm->conf.long_name, hlr, gsm->conf.allow_all);
-       if (!gsm->network) {
+       if (gsm->conf.openbsc_cfg[0] == '/')
+               SCPY(cfg, gsm->conf.openbsc_cfg);
+       else
+               SPRINT(cfg, "%s/%s", CONFIG_DATA, gsm->conf.openbsc_cfg);
+       rc = bsc_bootstrap_network(&message_bsc, cfg);
+       if (rc < 0) {
                PERROR("Failed to bootstrap GSM network.\n");
                return gsm_exit(-1);
        }
+       gsm->network = bsc_gsmnet;
+
+       /* set reject cause */
+       if (gsm->conf.reject_cause)
+               gsm0408_set_reject_cause(gsm->conf.reject_cause);
+
        /* open gsm loop interface */
        if (gsm_sock_open(gsm->conf.interface_bsc)) {
                return gsm_exit(-1);