X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm.cpp;h=961c11f275a24b5751769745919f3abd4a87d0e8;hp=77ec79131f890574c3b864d6bc900830fd40b371;hb=b33d7b898dce4721b875c200513c493801d13b6a;hpb=6db34c1dca5c3a2acd0af689319b583ff8271dbc

diff --git a/gsm.cpp b/gsm.cpp
index 77ec791..961c11f 100644
--- a/gsm.cpp
+++ b/gsm.cpp
@@ -10,23 +10,60 @@
 \*****************************************************************************/ 
 
 #include "main.h"
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 extern "C" {
-#include "openbsc/openbsc.h"
-#include "openbsc/mncc.h"
-#include "openbsc/trau_frame.h"
-#include "bootstrap.h"
+#include <getopt.h>
+
+#include <openbsc/db.h>
+#include <osmocore/select.h>
+#include <openbsc/debug.h>
+#include <openbsc/e1_input.h>
+#include <osmocore/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);
+void on_dso_load_ho_dec(void);
+int bts_model_unknown_init(void);
+int bts_model_bs11_init(void);
+int bts_model_nanobts_init(void);
+static struct debug_target *stderr_target;
+
+/* timer to store statistics */
+#define DB_SYNC_INTERVAL	60, 0
+static struct timer_list db_sync_timer;
+
 #include "gsm_audio.h"
 
-#undef AF_ISDN
-#undef PF_ISDN
-extern  int     AF_ISDN;
-#define PF_ISDN AF_ISDN
 }
 
+#include <mISDN/mISDNcompat.h>
+
 struct lcr_gsm *gsm = NULL;
 
 static unsigned int new_callref = 1;
 
+/* timer handling */
+static int _db_store_counter(struct counter *counter, void *data)
+{
+	return db_store_counter(counter);
+}
+
+static void db_sync_timer_cb(void *data)
+{
+	/* store counters to database and re-schedule */
+	counters_for_each(_db_store_counter, NULL);
+	bsc_schedule_timer(&db_sync_timer, DB_SYNC_INTERVAL);
+}
 
 /*
  * create and send mncc message
@@ -40,7 +77,7 @@ static struct gsm_mncc *create_mncc(int msg_type, unsigned int callref)
 	mncc->callref = callref;
 	return (mncc);
 }
-static int send_and_free_mncc(void *net, unsigned int msg_type, void *data)
+static int send_and_free_mncc(struct gsm_network *net, unsigned int msg_type, void *data)
 {
 	int ret;
 
@@ -50,6 +87,7 @@ static int send_and_free_mncc(void *net, unsigned int msg_type, void *data)
 	return ret;
 }
 
+static int delete_event(struct lcr_work *work, void *instance, int index);
 
 /*
  * constructor
@@ -57,6 +95,8 @@ static int send_and_free_mncc(void *net, unsigned int msg_type, void *data)
 Pgsm::Pgsm(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive, int mode) : PmISDN(type, mISDNport, portname, settings, channel, exclusive, mode)
 {
 	p_callerinfo.itype = (mISDNport->ifport->interface->extension)?INFO_ITYPE_ISDN_EXTENSION:INFO_ITYPE_ISDN;
+	memset(&p_m_g_delete, 0, sizeof(p_m_g_delete));
+	add_work(&p_m_g_delete, delete_event, this, 0);
 	p_m_g_callref = 0;
 	p_m_g_mode = 0;
 	p_m_g_gsm_b_sock = -1;
@@ -67,7 +107,7 @@ Pgsm::Pgsm(int type, struct mISDNport *mISDNport, char *portname, struct port_se
 	p_m_g_encoder = gsm_audio_create();
 	if (!p_m_g_encoder || !p_m_g_decoder) {
 		PERROR("Failed to create GSM audio codec instance\n");
-		p_m_delete = 1;
+		trigger_work(&p_m_g_delete);
 	}
 	p_m_g_rxpos = 0;
 	p_m_g_tch_connected = 0;
@@ -82,6 +122,8 @@ Pgsm::~Pgsm()
 {
 	PDEBUG(DEBUG_GSM, "Destroyed GSM process(%s).\n", p_name);
 
+	del_work(&p_m_g_delete);
+
 	/* remove queued message */
 	if (p_m_g_notify_pending)
 		message_free(p_m_g_notify_pending);
@@ -101,18 +143,21 @@ Pgsm::~Pgsm()
 /* close bsc side bchannel */
 void Pgsm::bchannel_close(void)
 {
-	if (p_m_g_gsm_b_sock > -1)
+	if (p_m_g_gsm_b_sock > -1) {
+		unregister_fd(&p_m_g_gsm_b_fd);
 		close(p_m_g_gsm_b_sock);
+	}
 	p_m_g_gsm_b_sock = -1;
 	p_m_g_gsm_b_index = -1;
 	p_m_g_gsm_b_active = 0;
 }
 
+static int b_handler(struct lcr_fd *fd, unsigned int what, void *instance, int index);
+
 /* open bsc side bchannel */
 int Pgsm::bchannel_open(int index)
 {
 	int ret;
-	unsigned int on = 1;
 	struct sockaddr_mISDN addr;
 	struct mISDNhead act;
 
@@ -128,14 +173,10 @@ int Pgsm::bchannel_open(int index)
 		bchannel_close();
 		return(ret);
 	}
-	
-	/* set nonblocking io */
-	ret = ioctl(p_m_g_gsm_b_sock, FIONBIO, &on);
-	if (ret < 0) {
-		PERROR("Failed to set bchannel-socket index %d into nonblocking IO\n", index);
-		bchannel_close();
-		return(ret);
-	}
+	memset(&p_m_g_gsm_b_fd, 0, sizeof(p_m_g_gsm_b_fd));
+	p_m_g_gsm_b_fd.fd = p_m_g_gsm_b_sock;
+	register_fd(&p_m_g_gsm_b_fd, LCR_FD_READ, b_handler, this, 0);
+
 
 	/* bind socket to bchannel */
 	addr.family = AF_ISDN;
@@ -166,9 +207,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)
@@ -186,31 +225,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);
 		}
 	}
 }
@@ -231,60 +246,36 @@ void Pgsm::bchannel_send(unsigned int prim, unsigned int id, unsigned char *data
 	memcpy(buf+MISDN_HEADER_LEN, data, len);
 	ret = sendto(p_m_g_gsm_b_sock, buf, MISDN_HEADER_LEN+len, 0, NULL, 0);
 	if (ret <= 0)
-		PERROR("Failed to send to socket index %d\n", index);
+		PERROR("Failed to send to socket index %d\n", p_m_g_gsm_b_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));
-	mncc_send(gsm->network, frame->msg_type, 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];
 	}
@@ -391,18 +382,20 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
 		/* release in case the ID is already in use */
 		add_trace("error", NULL, "callref already in use");
 		end_trace();
+		mncc = create_mncc(MNCC_REJ_REQ, callref);
 		gsm_trace_header(p_m_mISDNport, this, MNCC_REJ_REQ, DIRECTION_OUT);
-		add_trace("cause", "location", "1");
-		add_trace("cause", "value", "47");
+		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();
-		mncc = create_mncc(MNCC_REJ_REQ, callref);
-		mncc->cause = 1;
-		mncc->cause_location = 1;
-		mncc->cause_value = 47;
-		send_and_free_mncc(gsm->network, mncc->msg_type, mncc);
+		send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 		new_state(PORT_STATE_RELEASE);
-		p_m_delete = 1;
+		trigger_work(&p_m_g_delete);
 		return;
 	}
 	p_m_g_callref = callref;
@@ -410,38 +403,41 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
 
 	/* if blocked, release call with MT_RELEASE_COMPLETE */
 	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);
-		add_trace("cause", "location", "1");
-		add_trace("cause", "value", "27");
-		add_trace("reason", NULL, "port blocked");
+		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();
-		mncc = create_mncc(MNCC_REJ_REQ, p_m_g_callref);
-		mncc->cause = 1;
-		mncc->cause_location = 1;
-		mncc->cause_value = 27;
-		send_and_free_mncc(gsm->network, mncc->msg_type, mncc);
+		send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 		new_state(PORT_STATE_RELEASE);
-		p_m_delete = 1;
+		trigger_work(&p_m_g_delete);
 		return;
 	}
 
 	/* 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;
@@ -479,18 +475,20 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
 	ret = seize_bchannel(channel, 1);
 	if (ret < 0) {
 		no_channel:
+		mncc = create_mncc(MNCC_REJ_REQ, p_m_g_callref);
 		gsm_trace_header(p_m_mISDNport, this, MNCC_REJ_REQ, DIRECTION_OUT);
-		add_trace("cause", "location", "1");
-		add_trace("cause", "value", "34");
+		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();
-		mncc = create_mncc(MNCC_REJ_REQ, p_m_g_callref);
-		mncc->cause = 1;
-		mncc->cause_location = 1;
-		mncc->cause_value = 34;
-		send_and_free_mncc(gsm->network, mncc->msg_type, mncc);
+		send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 		new_state(PORT_STATE_RELEASE);
-		p_m_delete = 1;
+		trigger_work(&p_m_g_delete);
 		return;
 	}
 	bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
@@ -499,7 +497,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();
 
@@ -514,26 +516,26 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
 
 	/* modify lchan to GSM codec V1 */
 	gsm_trace_header(p_m_mISDNport, this, MNCC_LCHAN_MODIFY, DIRECTION_OUT);
-	end_trace();
 	mode = create_mncc(MNCC_LCHAN_MODIFY, p_m_g_callref);
 	mode->lchan_mode = 0x01; /* GSM V1 */
 	add_trace("mode", NULL, "0x%02x", mode->lchan_mode);
-	send_and_free_mncc(gsm->network, mode->msg_type, mode);
+	end_trace();
+	send_and_free_mncc((struct gsm_network *)gsm->network, mode->msg_type, mode);
 
 	/* send call proceeding */
 	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);
-	}
-	send_and_free_mncc(gsm->network, proceeding->msg_type, proceeding);
+		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);
 
 	new_state(PORT_STATE_IN_PROCEEDING);
 
@@ -541,7 +543,7 @@ void Pgsm::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
 		gsm_trace_header(p_m_mISDNport, this, MNCC_FRAME_RECV, DIRECTION_OUT);
 		end_trace();
 		frame = create_mncc(MNCC_FRAME_RECV, p_m_g_callref);
-		send_and_free_mncc(gsm->network, frame->msg_type, frame);
+		send_and_free_mncc((struct gsm_network *)gsm->network, frame->msg_type, frame);
 		p_m_g_tch_connected = 1;
 	}
 
@@ -553,9 +555,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);
 }
 
@@ -577,7 +579,7 @@ void Pgsm::start_dtmf_ind(unsigned int msg_type, unsigned int callref, struct gs
 	end_trace();
 	resp = create_mncc(MNCC_START_DTMF_RSP, p_m_g_callref);
 	resp->keypad = mncc->keypad;
-	send_and_free_mncc(gsm->network, resp->msg_type, resp);
+	send_and_free_mncc((struct gsm_network *)gsm->network, resp->msg_type, resp);
 
 	/* send dialing information */
 	message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_INFORMATION);
@@ -598,7 +600,7 @@ void Pgsm::stop_dtmf_ind(unsigned int msg_type, unsigned int callref, struct gsm
 	end_trace();
 	resp = create_mncc(MNCC_STOP_DTMF_RSP, p_m_g_callref);
 	resp->keypad = mncc->keypad;
-	send_and_free_mncc(gsm->network, resp->msg_type, resp);
+	send_and_free_mncc((struct gsm_network *)gsm->network, resp->msg_type, resp);
 }
 
 /* PROCEEDING INDICATION */
@@ -607,9 +609,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", "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();
 
@@ -618,8 +621,8 @@ void Pgsm::call_conf_ind(unsigned int msg_type, unsigned int callref, struct gsm
 	mode = create_mncc(MNCC_LCHAN_MODIFY, p_m_g_callref);
 	mode->lchan_mode = 0x01; /* GSM V1 */
 	add_trace("mode", NULL, "0x%02x", mode->lchan_mode);
-	send_and_free_mncc(gsm->network, mode->msg_type, mode);
 	end_trace();
+	send_and_free_mncc((struct gsm_network *)gsm->network, mode->msg_type, mode);
 
 }
 
@@ -644,16 +647,31 @@ 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 */
 	gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_COMPL_REQ, DIRECTION_OUT);
 	resp = create_mncc(MNCC_SETUP_COMPL_REQ, p_m_g_callref);
 	end_trace();
-	send_and_free_mncc(gsm->network, resp->msg_type, resp);
+	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);
@@ -662,7 +680,7 @@ void Pgsm::setup_cnf(unsigned int msg_type, unsigned int callref, struct gsm_mnc
 		gsm_trace_header(p_m_mISDNport, this, MNCC_FRAME_RECV, DIRECTION_OUT);
 		end_trace();
 		frame = create_mncc(MNCC_FRAME_RECV, p_m_g_callref);
-		send_and_free_mncc(gsm->network, frame->msg_type, frame);
+		send_and_free_mncc((struct gsm_network *)gsm->network, frame->msg_type, frame);
 		p_m_g_tch_connected = 1;
 	}
 }
@@ -681,7 +699,7 @@ void Pgsm::setup_compl_ind(unsigned int msg_type, unsigned int callref, struct g
 		gsm_trace_header(p_m_mISDNport, this, MNCC_FRAME_RECV, DIRECTION_OUT);
 		end_trace();
 		frame = create_mncc(MNCC_FRAME_RECV, p_m_g_callref);
-		send_and_free_mncc(gsm->network, frame->msg_type, frame);
+		send_and_free_mncc((struct gsm_network *)gsm->network, frame->msg_type, frame);
 		p_m_g_tch_connected = 1;
 	}
 }
@@ -694,24 +712,29 @@ 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;
+	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);
 	}
 	end_trace();
 
 	/* send release */
+	resp = create_mncc(MNCC_REL_REQ, p_m_g_callref);
 	gsm_trace_header(p_m_mISDNport, this, MNCC_REL_REQ, DIRECTION_OUT);
-	add_trace("cause", "location", "%d", 1);
-	add_trace("cause", "value", "%d", cause);
+#if 0
+	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();
-	resp = create_mncc(MNCC_REL_REQ, p_m_g_callref);
-	resp->cause = 1;
-	resp->cause_location = 1;
-	resp->cause_value = cause;
-	send_and_free_mncc(gsm->network, resp->msg_type, resp);
+	send_and_free_mncc((struct gsm_network *)gsm->network, resp->msg_type, resp);
 
 	/* sending release to endpoint */
 	while(p_epointlist) {
@@ -723,7 +746,7 @@ void Pgsm::disc_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
 		free_epointlist(p_epointlist);
 	}
 	new_state(PORT_STATE_RELEASE);
-	p_m_delete = 1;
+	trigger_work(&p_m_g_delete);
 }
 
 /* CC_RELEASE INDICATION */
@@ -733,11 +756,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", "location", "%d", location);
-		add_trace("cause", "value", "%d", cause);
+	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();
 
@@ -751,14 +775,21 @@ void Pgsm::rel_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
 		free_epointlist(p_epointlist);
 	}
 	new_state(PORT_STATE_RELEASE);
-	p_m_delete = 1;
+	trigger_work(&p_m_g_delete);
 }
 
 /* NOTIFY INDICATION */
 void Pgsm::notify_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc)
 {
+	struct lcr_msg *message;
+
 	gsm_trace_header(p_m_mISDNport, this, msg_type, DIRECTION_IN);
+	add_trace("notify", NULL, "%d", mncc->notify);
 	end_trace();
+
+	message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_NOTIFY);
+	message->param.notifyinfo.notify = mncc->notify;
+	message_put(message);
 }
 
 
@@ -781,14 +812,14 @@ void Pgsm::hold_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
 	gsm_trace_header(p_m_mISDNport, this, MNCC_HOLD_CNF, DIRECTION_OUT);
 	end_trace();
 	resp = create_mncc(MNCC_HOLD_CNF, p_m_g_callref);
-	send_and_free_mncc(gsm->network, resp->msg_type, resp);
+	send_and_free_mncc((struct gsm_network *)gsm->network, resp->msg_type, resp);
 
 	/* disable audio */
 	if (p_m_g_tch_connected) { /* it should be true */
 		gsm_trace_header(p_m_mISDNport, this, MNCC_FRAME_DROP, DIRECTION_OUT);
 		end_trace();
 		frame = create_mncc(MNCC_FRAME_DROP, p_m_g_callref);
-		send_and_free_mncc(gsm->network, frame->msg_type, frame);
+		send_and_free_mncc((struct gsm_network *)gsm->network, frame->msg_type, frame);
 		p_m_g_tch_connected = 0;
 	}
 }
@@ -813,14 +844,14 @@ void Pgsm::retr_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
 	gsm_trace_header(p_m_mISDNport, this, MNCC_RETRIEVE_CNF, DIRECTION_OUT);
 	end_trace();
 	resp = create_mncc(MNCC_RETRIEVE_CNF, p_m_g_callref);
-	send_and_free_mncc(gsm->network, resp->msg_type, resp);
+	send_and_free_mncc((struct gsm_network *)gsm->network, resp->msg_type, resp);
 
 	/* enable audio */
 	if (!p_m_g_tch_connected) { /* it should be true */
 		gsm_trace_header(p_m_mISDNport, this, MNCC_FRAME_RECV, DIRECTION_OUT);
 		end_trace();
 		frame = create_mncc(MNCC_FRAME_RECV, p_m_g_callref);
-		send_and_free_mncc(gsm->network, frame->msg_type, frame);
+		send_and_free_mncc((struct gsm_network *)gsm->network, frame->msg_type, frame);
 		p_m_g_tch_connected = 1;
 	}
 }
@@ -828,7 +859,7 @@ void Pgsm::retr_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
 /*
  * BSC sends message to port
  */
-static int message_bcs(void *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;
@@ -854,9 +885,9 @@ static int message_bcs(void *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;
 	}
 
@@ -873,16 +904,17 @@ static int message_bcs(void *net, int msg_type, void *arg)
 		if (!mISDNport) {
 			struct gsm_mncc *rej;
 
+			rej = create_mncc(MNCC_REJ_REQ, callref);
+			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", "location", "1");
-			add_trace("cause", "value", "27");
-			add_trace("reason", NULL, "GSM port not loaded");
+			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();
-			rej = create_mncc(MNCC_REJ_REQ, callref);
-			rej->cause = 1;
-			rej->cause_location = 1;
-			rej->cause_value = 27;
-			send_and_free_mncc(gsm->network, rej->msg_type, rej);
+			send_and_free_mncc((struct gsm_network *)gsm->network, rej->msg_type, rej);
 			return 0;
 		}
 		/* creating port object, transparent until setup with hdlc */
@@ -974,7 +1006,7 @@ void Pgsm::message_setup(unsigned int epoint_id, int message_id, union parameter
 		message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
 		message_put(message);
 		new_state(PORT_STATE_RELEASE);
-		p_m_delete = 1;
+		trigger_work(&p_m_g_delete);
 		return;
 	}
 	
@@ -988,7 +1020,7 @@ void Pgsm::message_setup(unsigned int epoint_id, int message_id, union parameter
 		message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
 		message_put(message);
 		new_state(PORT_STATE_RELEASE);
-		p_m_delete = 1;
+		trigger_work(&p_m_g_delete);
 		return;
 	}
 
@@ -1008,7 +1040,7 @@ void Pgsm::message_setup(unsigned int epoint_id, int message_id, union parameter
 		message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
 		message_put(message);
 		new_state(PORT_STATE_RELEASE);
-		p_m_delete = 1;
+		trigger_work(&p_m_g_delete);
 		return;
 	}
 	bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
@@ -1018,7 +1050,6 @@ void Pgsm::message_setup(unsigned int epoint_id, int message_id, union parameter
 //		SCPY(&p_m_tones_dir, param->setup.ext.tones_dir);
 	/* screen outgoing caller id */
 	do_screen(1, p_callerinfo.id, sizeof(p_callerinfo.id), &p_callerinfo.ntype, &p_callerinfo.present, p_m_mISDNport->ifport->interface);
-	do_screen(1, p_callerinfo.id2, sizeof(p_callerinfo.id2), &p_callerinfo.ntype2, &p_callerinfo.present2, p_m_mISDNport->ifport->interface);
 
 	/* attach only if not already */
 	epointlist = p_epointlist;
@@ -1039,112 +1070,117 @@ 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->calling_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
 
-	send_and_free_mncc(gsm->network, mncc->msg_type, mncc);
 	end_trace();
+	send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 
 	new_state(PORT_STATE_OUT_SETUP);
 
@@ -1160,7 +1196,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) {
@@ -1176,7 +1212,7 @@ void Pgsm::message_notify(unsigned int epoint_id, int message_id, union paramete
 			end_trace();
 			mncc = create_mncc(MNCC_NOTIFY_REQ, p_m_g_callref);
 			mncc->notify = notify;
-			send_and_free_mncc(gsm->network, mncc->msg_type, mncc);
+			send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 		}
 	}
 }
@@ -1190,16 +1226,16 @@ 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);
-	}
-	send_and_free_mncc(gsm->network, mncc->msg_type, mncc);
+		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);
 
 	new_state(PORT_STATE_IN_ALERTING);
 
@@ -1207,7 +1243,7 @@ void Pgsm::message_alerting(unsigned int epoint_id, int message_id, union parame
 		gsm_trace_header(p_m_mISDNport, this, MNCC_FRAME_RECV, DIRECTION_OUT);
 		end_trace();
 		mncc = create_mncc(MNCC_FRAME_RECV, p_m_g_callref);
-		send_and_free_mncc(gsm->network, mncc->msg_type, mncc);
+		send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 		p_m_g_tch_connected = 1;
 	}
 }
@@ -1226,54 +1262,54 @@ 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(gsm->network, mncc->msg_type, mncc);
+	send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 
 	new_state(PORT_STATE_CONNECT_WAITING);
 }
@@ -1287,21 +1323,23 @@ 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_location = param->disconnectinfo.location;
-	mncc->cause_value = param->disconnectinfo.cause;
-	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(gsm->network, mncc->msg_type, mncc);
+	send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 
 	new_state(PORT_STATE_OUT_DISCONNECT);
 
@@ -1309,7 +1347,7 @@ void Pgsm::message_disconnect(unsigned int epoint_id, int message_id, union para
 		gsm_trace_header(p_m_mISDNport, this, MNCC_FRAME_RECV, DIRECTION_OUT);
 		end_trace();
 		mncc = create_mncc(MNCC_FRAME_RECV, p_m_g_callref);
-		send_and_free_mncc(gsm->network, mncc->msg_type, mncc);
+		send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 		p_m_g_tch_connected = 1;
 	}
 }
@@ -1323,16 +1361,18 @@ 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_location = param->disconnectinfo.location;
-	mncc->cause_value = param->disconnectinfo.cause;
-	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(gsm->network, mncc->msg_type, mncc);
+	send_and_free_mncc((struct gsm_network *)gsm->network, mncc->msg_type, mncc);
 
 	new_state(PORT_STATE_RELEASE);
-	p_m_delete = 1;
+	trigger_work(&p_m_g_delete);
 	return;
 }
 
@@ -1415,28 +1455,29 @@ int Pgsm::message_epoint(unsigned int epoint_id, int message_id, union parameter
 }
 
 
+/* deletes only if l3id is release, otherwhise it will be triggered then */
+static int delete_event(struct lcr_work *work, void *instance, int index)
+{
+	class Pgsm *gsmport = (class Pgsm *)instance;
+
+	delete gsmport;
+
+	return 0;
+}
+
 /*
- * handler
+ * handler of bchannel events
  */
-int Pgsm::handler(void)
+static int b_handler(struct lcr_fd *fd, unsigned int what, void *instance, int index)
 {
+	class Pgsm *gsmport = (class Pgsm *)instance;
 	int ret;
-	int work = 0;
 	unsigned char buffer[2048+MISDN_HEADER_LEN];
 	struct mISDNhead *hh = (struct mISDNhead *)buffer;
 
-	if ((ret = PmISDN::handler()))
-		return(ret);
-
-	/* handle destruction */
-	if (p_m_delete) {
-		delete this;
-		return(-1);
-	}
-
 	/* handle message from bchannel */
-	if (p_m_g_gsm_b_sock > -1) {
-		ret = recv(p_m_g_gsm_b_sock, buffer, sizeof(buffer), 0);
+	if (gsmport->p_m_g_gsm_b_sock > -1) {
+		ret = recv(gsmport->p_m_g_gsm_b_sock, buffer, sizeof(buffer), 0);
 		if (ret >= (int)MISDN_HEADER_LEN) {
 			switch(hh->prim) {
 				/* we don't care about confirms, we use rx data to sync tx */
@@ -1444,37 +1485,21 @@ int Pgsm::handler(void)
 				break;
 				/* we receive audio data, we respond to it AND we send tones */
 				case PH_DATA_IND:
-				bchannel_receive(hh, buffer+MISDN_HEADER_LEN, ret-MISDN_HEADER_LEN);
+				gsmport->bchannel_receive(hh, buffer+MISDN_HEADER_LEN, ret-MISDN_HEADER_LEN);
 				break;
 				case PH_ACTIVATE_IND:
-				p_m_g_gsm_b_active = 1;
+				gsmport->p_m_g_gsm_b_active = 1;
 				break;
 				case PH_DEACTIVATE_IND:
-				p_m_g_gsm_b_active = 0;
+				gsmport->p_m_g_gsm_b_active = 0;
 				break;
 			}
-			work = 1;
 		} else {
 			if (ret < 0 && errno != EWOULDBLOCK)
 				PERROR("Read from GSM port, index %d failed with return code %d\n", ret);
 		}
 	}
 
-	return(work);
-}
-
-
-/*
- * handles bsc select function within LCR's main loop
- */
-int handle_gsm(void)
-{
-	int ret1, ret2;
-
-	ret1 = bsc_upqueue(gsm->network);
-	ret2 = bsc_select_main(1); /* polling */
-	if (ret1 || ret2)
-		return 1;
 	return 0;
 }
 
@@ -1528,7 +1553,7 @@ static int gsm_sock_open(char *portname)
 		PERROR_RUNTIME("GSM port %d does not support TE PRI or TE BRI.\n", gsm->gsm_port);
 	}
 	/* open socket */
-	if ((gsm->gsm_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_TE_S0)) < 0) {
+	if ((gsm->gsm_sock = socket(PF_ISDN, SOCK_DGRAM, (pri)?ISDN_P_TE_E1:ISDN_P_TE_S0)) < 0) {
 		PERROR_RUNTIME("GSM port %d failed to open socket.\n", gsm->gsm_port);
 		gsm_sock_close();
 		return gsm->gsm_sock;
@@ -1562,11 +1587,11 @@ int gsm_exit(int rc)
 			gsm_sock_close();
 		/* shutdown network */
 		if (gsm->network)
-			shutdown_net(gsm->network);
+			bsc_shutdown_net((struct gsm_network *)gsm->network);
 		/* free network */
-		if (gsm->network) {
-			free(gsm->network); /* TBD */
-		}
+//		if (gsm->network) {
+//			free((struct gsm_network *)gsm->network); /* TBD */
+//		}
 		free(gsm);
 		gsm = NULL;
 	}
@@ -1576,35 +1601,95 @@ 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;
+	char conf_error[128] = "";
+
+
+	debug_init();
+	tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc");
+	talloc_ctx_init();
+	on_dso_load_token();
+	on_dso_load_rrlp();
+	on_dso_load_ho_dec();
+	stderr_target = debug_target_create_stderr();
+	debug_add_target(stderr_target);
+
+	bts_model_unknown_init();
+	bts_model_bs11_init();
+	bts_model_nanobts_init();
+
+	/* enable filters */
+	debug_set_all_filter(stderr_target, 1);
+
+	/* seed the PRNG */
+	srand(time(NULL));
 
 	/* create gsm instance */
 	gsm = (struct lcr_gsm *)MALLOC(sizeof(struct lcr_gsm));
 	gsm->gsm_sock = -1;
 
 	/* parse options */
-	if (!gsm_conf(&gsm->conf)) {
-		PERROR("%s", gsm_conf_error);
+	if (!gsm_conf(&gsm->conf, conf_error)) {
+		PERROR("%s", conf_error);
 		return gsm_exit(-EINVAL);
 	}
 
+	/* set debug */
+	if (gsm->conf.debug[0])
+		debug_parse_category_mask(stderr_target, 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");
+
+	/* setup the timer */
+	db_sync_timer.cb = db_sync_timer_cb;
+	db_sync_timer.data = NULL;
+	bsc_schedule_timer(&db_sync_timer, DB_SYNC_INTERVAL);
+
 	/* 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;
+
 	/* open gsm loop interface */
 	if (gsm_sock_open(gsm->conf.interface_bsc)) {
 		return gsm_exit(-1);
@@ -1613,3 +1698,18 @@ int gsm_init(void)
 	return 0;
 }
 
+/*
+ * handles bsc select function within LCR's main loop
+ */
+int handle_gsm(void)
+{
+	int ret1, ret2;
+
+	ret1 = bsc_upqueue((struct gsm_network *)gsm->network);
+	debug_reset_context();
+	ret2 = bsc_select_main(1); /* polling */
+	if (ret1 || ret2)
+		return 1;
+	return 0;
+}
+