X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm_ms.cpp;h=0cbcca1fdac68842db7cf6ffb80f6dca65fb54dc;hp=1e33162df5ec9199d03f749143a4da681dd5b472;hb=f854931ffbee9464b278c433c4fdc7c3ea5af2fb;hpb=132d639333dd5e7a7832dcd9784181ee09a16f9e diff --git a/gsm_ms.cpp b/gsm_ms.cpp index 1e33162..0cbcca1 100644 --- a/gsm_ms.cpp +++ b/gsm_ms.cpp @@ -10,60 +10,46 @@ \*****************************************************************************/ #include "main.h" +#include "mncc.h" -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -extern "C" { -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -} -//char *config_dir = NULL; +struct lcr_gsm *gsm_ms_first = NULL; -short vty_port = 4247; +static int dtmf_timeout(struct lcr_timer *timer, void *instance, int index); -struct llist_head ms_list; -struct log_target *stderr_target; -void *l23_ctx = NULL; -struct gsmtap_inst *gsmtap_inst; +#define DTMF_ST_IDLE 0 /* no DTMF active */ +#define DTMF_ST_START 1 /* DTMF started, waiting for resp. */ +#define DTMF_ST_MARK 2 /* wait tone duration */ +#define DTMF_ST_STOP 3 /* DTMF stopped, waiting for resp. */ +#define DTMF_ST_SPACE 4 /* wait space between tones */ -static int dtmf_timeout(struct lcr_timer *timer, void *instance, int index); +#define RTP_PT_GSM_FULL 3 /* * constructor */ -Pgsm_ms::Pgsm_ms(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive, int mode) : Pgsm(type, mISDNport, portname, settings, channel, exclusive, mode) +Pgsm_ms::Pgsm_ms(int type, char *portname, struct port_settings *settings, struct interface *interface) : Pgsm(type, portname, settings, interface) { - struct osmocom_ms *ms = NULL; - char *ms_name = mISDNport->ifport->gsm_ms_name; + struct lcr_gsm *gsm_ms = gsm_ms_first; - p_m_g_instance = NULL; + p_g_lcr_gsm = NULL; + SCPY(p_g_ms_name, interface->gsm_ms_name); - llist_for_each_entry(ms, &ms_list, entity) { - if (!strcmp(ms->name, ms_name)) { - p_m_g_instance = ms; + while (gsm_ms) { + if (gsm_ms->type == LCR_GSM_TYPE_MS && !strcmp(gsm_ms->name, p_g_ms_name)) { + p_g_lcr_gsm = gsm_ms; break; } + gsm_ms = gsm_ms->gsm_ms_next; } - p_m_g_dtmf_state = DTMF_ST_IDLE; - p_m_g_dtmf_index = 0; - p_m_g_dtmf[0] = '\0'; - memset(&p_m_g_dtmf_timer, 0, sizeof(p_m_g_dtmf_timer)); - add_timer(&p_m_g_dtmf_timer, dtmf_timeout, this, 0); + p_g_dtmf_state = DTMF_ST_IDLE; + p_g_dtmf_index = 0; + p_g_dtmf[0] = '\0'; + memset(&p_g_dtmf_timer, 0, sizeof(p_g_dtmf_timer)); + add_timer(&p_g_dtmf_timer, dtmf_timeout, this, 0); - PDEBUG(DEBUG_GSM, "Created new GSMMSPort(%s %s).\n", portname, ms_name); + PDEBUG(DEBUG_GSM, "Created new GSMMSPort(%s %s).\n", portname, p_g_ms_name); } /* @@ -72,7 +58,7 @@ Pgsm_ms::Pgsm_ms(int type, struct mISDNport *mISDNport, char *portname, struct p Pgsm_ms::~Pgsm_ms() { PDEBUG(DEBUG_GSM, "Destroyed GSM MS process(%s).\n", p_name); - del_timer(&p_m_g_dtmf_timer); + del_timer(&p_g_dtmf_timer); } /* @@ -81,21 +67,26 @@ Pgsm_ms::~Pgsm_ms() /* SETUP INDICATION */ void Pgsm_ms::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc) { - int ret; class Endpoint *epoint; struct lcr_msg *message; - int channel; - struct gsm_mncc *mode, *proceeding, *frame; + struct gsm_mncc *proceeding, *frame; + struct interface *interface; + + interface = getinterfacebyname(p_g_interface_name); + if (!interface) { + PERROR("Cannot find interface %s.\n", p_g_interface_name); + return; + } /* process given callref */ - l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_IND, DIRECTION_IN); + gsm_trace_header(p_g_interface_name, this, 0, DIRECTION_IN); add_trace("callref", "new", "0x%x", callref); - if (p_m_g_callref) { + if (p_g_callref) { /* 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); + gsm_trace_header(p_g_interface_name, this, MNCC_REJ_REQ, DIRECTION_OUT); mncc->fields |= MNCC_F_CAUSE; mncc->cause.coding = 3; mncc->cause.location = 1; @@ -105,34 +96,15 @@ void Pgsm_ms::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_ add_trace("cause", "value", "%d", mncc->cause.value); add_trace("reason", NULL, "callref already in use"); end_trace(); - send_and_free_mncc(p_m_g_instance, mncc->msg_type, mncc); + send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc); new_state(PORT_STATE_RELEASE); - trigger_work(&p_m_g_delete); + trigger_work(&p_g_delete); return; } - p_m_g_callref = callref; + p_g_callref = callref; end_trace(); - /* 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); - 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(p_m_g_instance, mncc->msg_type, mncc); - new_state(PORT_STATE_RELEASE); - trigger_work(&p_m_g_delete); - return; - } - - gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_IND, DIRECTION_IN); + gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_IND, DIRECTION_IN); /* caller information */ p_callerinfo.ntype = INFO_NTYPE_NOTPRESENT; if (mncc->fields & MNCC_F_CALLING) { @@ -185,8 +157,7 @@ void Pgsm_ms::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_ add_trace("calling", "screen", "%d", mncc->calling.screen); add_trace("calling", "number", "%s", mncc->calling.number); } - p_callerinfo.isdn_port = p_m_portnum; - SCPY(p_callerinfo.interface, p_m_mISDNport->ifport->interface->name); + SCPY(p_callerinfo.interface, p_g_interface_name); /* dialing information */ if (mncc->fields & MNCC_F_CALLED) { SCAT(p_dialinginfo.id, mncc->called.number); @@ -260,7 +231,6 @@ void Pgsm_ms::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_ add_trace("redir", "present", "%d", mncc->redirecting.present); add_trace("redir", "screen", "%d", mncc->redirecting.screen); add_trace("redir", "number", "%s", mncc->redirecting.number); - p_redirinfo.isdn_port = p_m_portnum; } /* bearer capability */ if (mncc->fields & MNCC_F_BEARER_CAP) { @@ -298,75 +268,39 @@ void Pgsm_ms::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_ end_trace(); - /* hunt channel */ - ret = channel = hunt_bchannel(); - if (ret < 0) - goto no_channel; - - /* open channel */ - 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); - 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(p_m_g_instance, mncc->msg_type, mncc); - new_state(PORT_STATE_RELEASE); - trigger_work(&p_m_g_delete); - return; - } - bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE); - if (bchannel_open(p_m_b_index)) - goto no_channel; - /* create endpoint */ if (p_epointlist) FATAL("Incoming call but already got an endpoint.\n"); if (!(epoint = new Endpoint(p_serial, 0))) FATAL("No memory for Endpoint instance\n"); - if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint, 0))) //incoming - FATAL("No memory for Endpoint Application instance\n"); + epoint->ep_app = new_endpointapp(epoint, 0, interface->app); //incoming epointlist_new(epoint->ep_serial); /* modify lchan to GSM codec V1 */ - gsm_trace_header(p_m_mISDNport, this, MNCC_LCHAN_MODIFY, DIRECTION_OUT); - 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); - end_trace(); - send_and_free_mncc(p_m_g_instance, mode->msg_type, mode); + modify_lchan(RTP_PT_GSM_FULL); /* send call proceeding */ - gsm_trace_header(p_m_mISDNport, this, MNCC_CALL_CONF_REQ, DIRECTION_OUT); - proceeding = create_mncc(MNCC_CALL_CONF_REQ, p_m_g_callref); + gsm_trace_header(p_g_interface_name, this, MNCC_CALL_CONF_REQ, DIRECTION_OUT); + proceeding = create_mncc(MNCC_CALL_CONF_REQ, p_g_callref); // FIXME: bearer /* DTMF supported */ proceeding->fields |= MNCC_F_CCCAP; proceeding->cccap.dtmf = 1; end_trace(); - send_and_free_mncc(p_m_g_instance, proceeding->msg_type, proceeding); + send_and_free_mncc(p_g_lcr_gsm, proceeding->msg_type, proceeding); new_state(PORT_STATE_IN_PROCEEDING); - if (p_m_mISDNport->tones && !p_m_g_tch_connected) { /* only if ... */ - gsm_trace_header(p_m_mISDNport, this, MNCC_FRAME_RECV, DIRECTION_OUT); + if (p_g_tones && !p_g_tch_connected) { /* only if ... */ + gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT); end_trace(); - frame = create_mncc(MNCC_FRAME_RECV, p_m_g_callref); - send_and_free_mncc(p_m_g_instance, frame->msg_type, frame); - p_m_g_tch_connected = 1; + frame = create_mncc(MNCC_FRAME_RECV, p_g_callref); + send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame); + p_g_tch_connected = 1; } /* send setup message to endpoit */ message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_SETUP); - message->param.setup.isdn_port = p_m_portnum; message->param.setup.port_type = p_type; // message->param.setup.dtmf = 0; memcpy(&message->param.setup.dialinginfo, &p_dialinginfo, sizeof(struct dialing_info)); @@ -381,41 +315,17 @@ void Pgsm_ms::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_ /* * MS sends message to port */ -static int message_ms(struct osmocom_ms *ms, int msg_type, void *arg) +int message_ms(struct lcr_gsm *gsm_ms, int msg_type, void *arg) { struct gsm_mncc *mncc = (struct gsm_mncc *)arg; unsigned int callref = mncc->callref; class Port *port; class Pgsm_ms *pgsm_ms = NULL; char name[64]; - struct mISDNport *mISDNport; +// struct mISDNport *mISDNport; /* Special messages */ switch (msg_type) { - case MS_NEW: - PDEBUG(DEBUG_GSM, "MS %s comes available\n", ms->name); - return 0; - case MS_DELETE: - PDEBUG(DEBUG_GSM, "MS %s is removed\n", ms->name); - port = port_first; - while(port) { - if ((port->p_type & PORT_CLASS_GSM_MASK) == PORT_CLASS_GSM_MS) { - pgsm_ms = (class Pgsm_ms *)port; - if (pgsm_ms->p_m_g_instance == ms) { - struct lcr_msg *message; - - pgsm_ms->p_m_g_instance = 0; - message = message_create(pgsm_ms->p_serial, ACTIVE_EPOINT(pgsm_ms->p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); - message->param.disconnectinfo.cause = 27; - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - message_put(message); - pgsm_ms->new_state(PORT_STATE_RELEASE); - trigger_work(&pgsm_ms->p_m_g_delete); - } - } - port = port->next; - } - return 0; } /* find callref */ @@ -424,30 +334,28 @@ static int message_ms(struct osmocom_ms *ms, int msg_type, void *arg) while(port) { if ((port->p_type & PORT_CLASS_GSM_MASK) == PORT_CLASS_GSM_MS) { pgsm_ms = (class Pgsm_ms *)port; - if (pgsm_ms->p_m_g_callref == callref) { + if (pgsm_ms->p_g_callref == callref) { break; } } port = port->next; } - if (msg_type == GSM_TCHF_FRAME) { + if (msg_type == GSM_TCHF_FRAME + || msg_type == GSM_TCHF_BAD_FRAME) { if (port) pgsm_ms->frame_receive(arg); return 0; } if (!port) { + struct interface *interface; + if (msg_type != MNCC_SETUP_IND) return(0); - /* find gsm ms port */ - mISDNport = mISDNport_first; - while(mISDNport) { - if (mISDNport->gsm_ms && !strcmp(mISDNport->ifport->gsm_ms_name, ms->name)) - break; - mISDNport = mISDNport->next; - } - if (!mISDNport) { + + interface = getinterfacebyname(gsm_ms->interface_name); + if (!interface) { struct gsm_mncc *rej; rej = create_mncc(MNCC_REJ_REQ, callref); @@ -459,14 +367,14 @@ static int message_ms(struct osmocom_ms *ms, int msg_type, void *arg) 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("reason", NULL, "interface %s not found", gsm_ms->interface_name); end_trace(); - send_and_free_mncc(ms, rej->msg_type, rej); + send_and_free_mncc(gsm_ms, rej->msg_type, rej); return 0; } /* creating port object, transparent until setup with hdlc */ - SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum); - if (!(pgsm_ms = new Pgsm_ms(PORT_TYPE_GSM_MS_IN, mISDNport, name, NULL, 0, 0, B_MODE_TRANSPARENT))) - + SPRINT(name, "%s-%d-in", interface->name, 0); + if (!(pgsm_ms = new Pgsm_ms(PORT_TYPE_GSM_MS_IN, name, NULL, interface))) FATAL("Cannot create Port instance.\n"); } @@ -521,10 +429,8 @@ static int message_ms(struct osmocom_ms *ms, int msg_type, void *arg) void Pgsm_ms::message_setup(unsigned int epoint_id, int message_id, union parameter *param) { struct lcr_msg *message; - int ret; struct epoint_list *epointlist; struct gsm_mncc *mncc; - int channel; /* copy setup infos to port */ memcpy(&p_callerinfo, ¶m->setup.callerinfo, sizeof(p_callerinfo)); @@ -533,22 +439,22 @@ void Pgsm_ms::message_setup(unsigned int epoint_id, int message_id, union parame memcpy(&p_redirinfo, ¶m->setup.redirinfo, sizeof(p_redirinfo)); /* no instance */ - if (!p_m_g_instance) { - gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_REQ, DIRECTION_OUT); - add_trace("failure", NULL, "MS %s instance is unavailable", p_m_mISDNport->ifport->gsm_ms_name); + if (!p_g_lcr_gsm || p_g_lcr_gsm->mncc_lfd.fd < 0) { + gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT); + add_trace("failure", NULL, "MS %s instance is unavailable", p_g_ms_name); end_trace(); message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); - message->param.disconnectinfo.cause = 27; + message->param.disconnectinfo.cause = 41; message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; message_put(message); new_state(PORT_STATE_RELEASE); - trigger_work(&p_m_g_delete); + trigger_work(&p_g_delete); return; } /* no number */ if (!p_dialinginfo.id[0]) { - gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_REQ, DIRECTION_OUT); + gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT); add_trace("failure", NULL, "No dialed subscriber given."); end_trace(); message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); @@ -556,47 +462,10 @@ void Pgsm_ms::message_setup(unsigned int epoint_id, int message_id, union parame message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; message_put(message); new_state(PORT_STATE_RELEASE); - trigger_work(&p_m_g_delete); - return; - } - - /* release if port is blocked */ - if (p_m_mISDNport->ifport->block) { - gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_REQ, DIRECTION_OUT); - add_trace("failure", NULL, "Port blocked."); - end_trace(); - message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); - message->param.disconnectinfo.cause = 27; // temp. unavail. - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - message_put(message); - new_state(PORT_STATE_RELEASE); - trigger_work(&p_m_g_delete); + trigger_work(&p_g_delete); return; } - /* hunt channel */ - ret = channel = hunt_bchannel(); - if (ret < 0) - goto no_channel; - /* open channel */ - ret = seize_bchannel(channel, 1); - if (ret < 0) { - no_channel: - gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_REQ, DIRECTION_OUT); - add_trace("failure", NULL, "No internal audio channel available."); - end_trace(); - message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); - message->param.disconnectinfo.cause = 34; - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - message_put(message); - new_state(PORT_STATE_RELEASE); - trigger_work(&p_m_g_delete); - return; - } - bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE); - if (bchannel_open(p_m_b_index)) - goto no_channel; - /* attach only if not already */ epointlist = p_epointlist; while(epointlist) { @@ -608,13 +477,13 @@ void Pgsm_ms::message_setup(unsigned int epoint_id, int message_id, union parame epointlist_new(epoint_id); /* creating l3id */ - l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_REQ, DIRECTION_OUT); - p_m_g_callref = new_callref++; - add_trace("callref", "new", "0x%x", p_m_g_callref); + gsm_trace_header(p_g_interface_name, this, 0, DIRECTION_OUT); + p_g_callref = new_callref++; + add_trace("callref", "new", "0x%x", p_g_callref); end_trace(); - gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_REQ, DIRECTION_OUT); - mncc = create_mncc(MNCC_SETUP_REQ, p_m_g_callref); + gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT); + mncc = create_mncc(MNCC_SETUP_REQ, p_g_callref); if (!strncasecmp(p_dialinginfo.id, "emerg", 5)) { mncc->emergency = 1; } else { @@ -670,7 +539,7 @@ void Pgsm_ms::message_setup(unsigned int epoint_id, int message_id, union parame } end_trace(); - send_and_free_mncc(p_m_g_instance, mncc->msg_type, mncc); + send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc); new_state(PORT_STATE_OUT_SETUP); @@ -678,49 +547,51 @@ void Pgsm_ms::message_setup(unsigned int epoint_id, int message_id, union parame message_put(message); new_state(PORT_STATE_OUT_PROCEEDING); + + p_g_rtp_bridge = 0; } void Pgsm_ms::dtmf_statemachine(struct gsm_mncc *mncc) { struct gsm_mncc *dtmf; - switch (p_m_g_dtmf_state) { + switch (p_g_dtmf_state) { case DTMF_ST_SPACE: case DTMF_ST_IDLE: /* end of string */ - if (!p_m_g_dtmf[p_m_g_dtmf_index]) { + if (!p_g_dtmf[p_g_dtmf_index]) { PDEBUG(DEBUG_GSM, "done with DTMF\n"); - p_m_g_dtmf_state = DTMF_ST_IDLE; + p_g_dtmf_state = DTMF_ST_IDLE; return; } - gsm_trace_header(p_m_mISDNport, this, MNCC_START_DTMF_REQ, DIRECTION_OUT); - dtmf = create_mncc(MNCC_START_DTMF_REQ, p_m_g_callref); - dtmf->keypad = p_m_g_dtmf[p_m_g_dtmf_index++]; - p_m_g_dtmf_state = DTMF_ST_START; + gsm_trace_header(p_g_interface_name, this, MNCC_START_DTMF_REQ, DIRECTION_OUT); + dtmf = create_mncc(MNCC_START_DTMF_REQ, p_g_callref); + dtmf->keypad = p_g_dtmf[p_g_dtmf_index++]; + p_g_dtmf_state = DTMF_ST_START; PDEBUG(DEBUG_GSM, "start DTMF (keypad %c)\n", dtmf->keypad); end_trace(); - send_and_free_mncc(p_m_g_instance, dtmf->msg_type, dtmf); + send_and_free_mncc(p_g_lcr_gsm, dtmf->msg_type, dtmf); return; case DTMF_ST_START: if (mncc->msg_type != MNCC_START_DTMF_RSP) { PDEBUG(DEBUG_GSM, "DTMF was rejected\n"); return; } - schedule_timer(&p_m_g_dtmf_timer, 0, 70 * 1000); - p_m_g_dtmf_state = DTMF_ST_MARK; + schedule_timer(&p_g_dtmf_timer, 0, 70 * 1000); + p_g_dtmf_state = DTMF_ST_MARK; PDEBUG(DEBUG_GSM, "DTMF is on\n"); break; case DTMF_ST_MARK: - gsm_trace_header(p_m_mISDNport, this, MNCC_STOP_DTMF_REQ, DIRECTION_OUT); - dtmf = create_mncc(MNCC_STOP_DTMF_REQ, p_m_g_callref); - p_m_g_dtmf_state = DTMF_ST_STOP; + gsm_trace_header(p_g_interface_name, this, MNCC_STOP_DTMF_REQ, DIRECTION_OUT); + dtmf = create_mncc(MNCC_STOP_DTMF_REQ, p_g_callref); + p_g_dtmf_state = DTMF_ST_STOP; end_trace(); - send_and_free_mncc(p_m_g_instance, dtmf->msg_type, dtmf); + send_and_free_mncc(p_g_lcr_gsm, dtmf->msg_type, dtmf); return; case DTMF_ST_STOP: - schedule_timer(&p_m_g_dtmf_timer, 0, 120 * 1000); - p_m_g_dtmf_state = DTMF_ST_SPACE; + schedule_timer(&p_g_dtmf_timer, 0, 120 * 1000); + p_g_dtmf_state = DTMF_ST_SPACE; PDEBUG(DEBUG_GSM, "DTMF is off\n"); break; } @@ -747,12 +618,12 @@ void Pgsm_ms::message_dtmf(unsigned int epoint_id, int message_id, union paramet return; /* schedule */ - if (p_m_g_dtmf_state == DTMF_ST_IDLE) { - p_m_g_dtmf_index = 0; - p_m_g_dtmf[0] = '\0'; + if (p_g_dtmf_state == DTMF_ST_IDLE) { + p_g_dtmf_index = 0; + p_g_dtmf[0] = '\0'; } - SCCAT(p_m_g_dtmf, digit); - if (p_m_g_dtmf_state == DTMF_ST_IDLE) + SCCAT(p_g_dtmf, digit); + if (p_g_dtmf_state == DTMF_ST_IDLE) dtmf_statemachine(NULL); } @@ -770,12 +641,12 @@ void Pgsm_ms::message_information(unsigned int epoint_id, int message_id, union continue; /* schedule */ - if (p_m_g_dtmf_state == DTMF_ST_IDLE) { - p_m_g_dtmf_index = 0; - p_m_g_dtmf[0] = '\0'; + if (p_g_dtmf_state == DTMF_ST_IDLE) { + p_g_dtmf_index = 0; + p_g_dtmf[0] = '\0'; } - SCCAT(p_m_g_dtmf, digit); - if (p_m_g_dtmf_state == DTMF_ST_IDLE) + SCCAT(p_g_dtmf, digit); + if (p_g_dtmf_state == DTMF_ST_IDLE) dtmf_statemachine(NULL); } } @@ -820,90 +691,81 @@ int Pgsm_ms::message_epoint(unsigned int epoint_id, int message_id, union parame int gsm_ms_exit(int rc) { - l23_app_exit(); + /* destroy all instances */ + while (gsm_ms_first) + gsm_ms_delete(gsm_ms_first->name); - return(rc); + return rc; } int gsm_ms_init(void) { - const char *home; - size_t len; - const char osmocomcfg[] = ".osmocom/bb/mobile.cfg"; - char *config_file = NULL; + return 0; +} - INIT_LLIST_HEAD(&ms_list); - log_init(&log_info, NULL); - stderr_target = log_target_create_stderr(); - log_add_target(stderr_target); - log_set_all_filter(stderr_target, 1); +/* add a new GSM mobile instance */ +int gsm_ms_new(struct interface *interface) +{ + struct lcr_gsm *gsm_ms = gsm_ms_first, **gsm_ms_p = &gsm_ms_first; - l23_ctx = talloc_named_const(NULL, 1, "layer2 context"); + while (gsm_ms) { + gsm_ms_p = &gsm_ms->gsm_ms_next; + gsm_ms = gsm_ms->gsm_ms_next; + } - log_parse_category_mask(stderr_target, "DNB:DCS:DPLMN:DRR:DMM:DSIM:DCC:DMNCC:DPAG:DSUM"); - log_set_log_level(stderr_target, LOGL_INFO); + PDEBUG(DEBUG_GSM, "GSM: interface for MS '%s' is created\n", interface->gsm_ms_name); -#if 0 - if (gsmtap_ip) { - rc = gsmtap_init(gsmtap_ip); - if (rc < 0) { - fprintf(stderr, "Failed during gsmtap_init()\n"); - exit(1); - } - } -#endif + /* create gsm instance */ + gsm_ms = (struct lcr_gsm *)MALLOC(sizeof(struct lcr_gsm)); - home = getenv("HOME"); - if (home != NULL) { - len = strlen(home) + 1 + sizeof(osmocomcfg); - config_file = (char *)talloc_size(l23_ctx, len); - if (config_file != NULL) - snprintf(config_file, len, "%s/%s", home, osmocomcfg); - } - /* save the config file directory name */ - config_dir = talloc_strdup(l23_ctx, config_file); - config_dir = dirname(config_dir); + SCPY(gsm_ms->interface_name, interface->name); + gsm_ms->type = LCR_GSM_TYPE_MS; + SCPY(gsm_ms->name, interface->gsm_ms_name); + gsm_ms->sun.sun_family = AF_UNIX; + SPRINT(gsm_ms->sun.sun_path, "/tmp/ms_mncc_%s", gsm_ms->name); - l23_app_init(message_ms, config_file, vty_port); + memset(&gsm_ms->socket_retry, 0, sizeof(gsm_ms->socket_retry)); + add_timer(&gsm_ms->socket_retry, mncc_socket_retry_cb, gsm_ms, 0); - return 0; -} + /* do the initial connect */ + mncc_socket_retry_cb(&gsm_ms->socket_retry, gsm_ms, 0); -/* add a new GSM mobile instance */ -int gsm_ms_new(const char *name) -{ - PDEBUG(DEBUG_GSM, "GSM: interface for MS '%s' is up\n", name); + *gsm_ms_p = gsm_ms; return 0; } int gsm_ms_delete(const char *name) { - struct osmocom_ms *ms; - int found = 0; - class Port *port; - class Pgsm_ms *pgsm_ms = NULL; + struct lcr_gsm *gsm_ms = gsm_ms_first, **gsm_ms_p = &gsm_ms_first; +// class Port *port; +// class Pgsm_ms *pgsm_ms = NULL; - PDEBUG(DEBUG_GSM, "GSM: interface for MS '%s' is down\n", name); + PDEBUG(DEBUG_GSM, "GSM: interface for MS '%s' is deleted\n", name); - llist_for_each_entry(ms, &ms_list, entity) { - if (!strcmp(ms->name, name)) { - found = 1; + while (gsm_ms) { + if (gsm_ms->type == LCR_GSM_TYPE_MS && !strcmp(gsm_ms->name, name)) break; - } + gsm_ms_p = &gsm_ms->gsm_ms_next; + gsm_ms = gsm_ms->gsm_ms_next; } - if (!found) + if (!gsm_ms) return 0; +/* not needed, because: + * - shutdown of interface will destry port instances locally + * - closing of socket will make remote socket destroy calls locally + */ +#if 0 port = port_first; while(port) { if ((port->p_type & PORT_CLASS_GSM_MASK) == PORT_CLASS_GSM_MS) { pgsm_ms = (class Pgsm_ms *)port; - if (pgsm_ms->p_m_g_instance == ms && pgsm_ms->p_m_g_callref) { + if (pgsm_ms->p_g_lcr_gsm == gsm_ms && pgsm_ms->p_g_callref) { struct gsm_mncc *rej; - rej = create_mncc(MNCC_REL_REQ, pgsm_ms->p_m_g_callref); + rej = create_mncc(MNCC_REL_REQ, pgsm_ms->p_g_callref); rej->fields |= MNCC_F_CAUSE; rej->cause.coding = 3; rej->cause.location = 1; @@ -913,28 +775,25 @@ int gsm_ms_delete(const char *name) add_trace("cause", "location", "%d", rej->cause.location); add_trace("cause", "value", "%d", rej->cause.value); end_trace(); + send_and_free_mncc(gsm_ms, rej->msg_type, rej); + pgsm_ms->new_state(PORT_STATE_RELEASE); + trigger_work(&pgsm_ms->p_g_delete); } } } +#endif - return 0; -} - -/* - * handles bsc select function within LCR's main loop - */ -int handle_gsm_ms(int *_quit) -{ - int work = 0, quit = 0; + if (gsm_ms->mncc_lfd.fd > -1) { + close(gsm_ms->mncc_lfd.fd); + unregister_fd(&gsm_ms->mncc_lfd); + } + del_timer(&gsm_ms->socket_retry); - if (l23_app_work(&quit)) - work = 1; - if (quit && llist_empty(&ms_list)) - *_quit = 1; -// debug_reset_context(); - if (osmo_select_main(1)) /* polling */ - work = 1; + /* remove instance from list */ + *gsm_ms_p = gsm_ms->gsm_ms_next; + FREE(gsm_ms, sizeof(struct lcr_gsm)); - return work; + return 0; } +