struct lcr_gsm *gsm_bs = NULL;
-#define RTP_PT_GSM_FULL 3
-#define RTP_PT_GSM_HALF 96
-#define RTP_PT_GSM_EFR 97
-#define RTP_PT_GSM_AMR 98
+#define PAYLOAD_TYPE_GSM 3
/*
* DTMF stuff
PDEBUG(DEBUG_GSM, "Destroyed GSM BS process(%s).\n", p_name);
}
+static const char *media_type2name(unsigned char media_type) {
+ switch (media_type) {
+ case MEDIA_TYPE_ULAW:
+ return "PCMU";
+ case MEDIA_TYPE_ALAW:
+ return "PCMA";
+ case MEDIA_TYPE_GSM:
+ return "GSM";
+ case MEDIA_TYPE_GSM_HR:
+ return "GSM-HR";
+ case MEDIA_TYPE_GSM_EFR:
+ return "GSM-EFR";
+ case MEDIA_TYPE_AMR:
+ return "AMR";
+ }
+
+ return "UKN";
+}
+
/* PROCEEDING INDICATION (from MS) */
void Pgsm_bs::call_conf_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc)
{
+ int media_types[8];
unsigned char payload_types[8];
int payloads = 0;
- gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+ gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
if (mncc->fields & MNCC_F_CAUSE) {
add_trace("cause", "coding", "%d", mncc->cause.coding);
add_trace("cause", "location", "%", mncc->cause.location);
/* get list of offered payload types
* if list ist empty, the FR V1 is selected */
- select_payload_type(mncc, payload_types, &payloads, sizeof(payload_types));
+ select_payload_type(mncc, payload_types, media_types, &payloads, sizeof(payload_types));
/* if no given payload type is supported, we assume */
if (!payloads) {
- payload_types[0] = RTP_PT_GSM_FULL;
+ media_types[0] = MEDIA_TYPE_GSM;
+ payload_types[0] = PAYLOAD_TYPE_GSM;
payloads = 1;
}
for (i = 0; i < p_g_rtp_payloads; i++) {
for (j = 0; j < payloads; j++) {
- if (p_g_rtp_payload_types[i] == payload_types[j])
+ if (p_g_rtp_media_types[i] == media_types[j])
break;
}
if (j < payloads)
message_put(message);
/* send release */
mncc = create_mncc(MNCC_REL_REQ, p_g_callref);
- gsm_trace_header(p_g_interface_name, this, MNCC_REL_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_REL_REQ, DIRECTION_OUT);
mncc->fields |= MNCC_F_CAUSE;
mncc->cause.coding = 3;
mncc->cause.location = LOCATION_PRIVATE_LOCAL;
send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
new_state(PORT_STATE_RELEASE);
trigger_work(&p_g_delete);
+
+ return;
}
- modify_lchan(p_g_rtp_payload_types[i]);
+ modify_lchan(p_g_rtp_media_types[i]);
+ /* use the payload type from received rtp list, not from locally generated payload types */
+ p_g_payload_type = p_g_rtp_payload_types[i];
} else {
/* modify to first given payload */
- modify_lchan(payload_types[0]);
+ modify_lchan(media_types[0]);
+ p_g_payload_type = payload_types[0];
}
}
{
struct gsm_mncc *resp;
- gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+ gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
add_trace("keypad", NULL, "%c", mncc->keypad);
end_trace();
SPRINT(p_dialinginfo.id, "%c", mncc->keypad);
p_dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
/* send resp */
- gsm_trace_header(p_g_interface_name, this, MNCC_START_DTMF_RSP, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_START_DTMF_RSP, DIRECTION_OUT);
add_trace("keypad", NULL, "%c", mncc->keypad);
end_trace();
resp = create_mncc(MNCC_START_DTMF_RSP, p_g_callref);
send_and_free_mncc(p_g_lcr_gsm, resp->msg_type, resp);
if (p_g_rtp_bridge) {
- class Port *remote = bridge_remote();
-
- if (remote) {
- struct lcr_msg *message;
-
- /* send dtmf information, because we bridge RTP directly */
- message = message_create(0, remote->p_serial, EPOINT_TO_PORT, MESSAGE_DTMF);
- message->param.dtmf = mncc->keypad;
- message_put(message);
+ /* if two members are bridged */
+ if (p_bridge && p_bridge->first && p_bridge->first->next && !p_bridge->first->next->next) {
+ class Port *remote = NULL;
+
+ /* select other member */
+ if (p_bridge->first->port == this)
+ remote = p_bridge->first->next->port;
+ if (p_bridge->first->next->port == this)
+ remote = p_bridge->first->port;
+
+ if (remote) {
+ struct lcr_msg *message;
+
+ /* send dtmf information, because we bridge RTP directly */
+ message = message_create(0, remote->p_serial, EPOINT_TO_PORT, MESSAGE_DTMF);
+ message->param.dtmf = mncc->keypad;
+ message_put(message);
+ }
}
} else {
/* generate DTMF tones, since we do audio forwarding inside LCR */
{
struct gsm_mncc *resp;
- gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+ gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
add_trace("keypad", NULL, "%c", mncc->keypad);
end_trace();
/* send resp */
- gsm_trace_header(p_g_interface_name, this, MNCC_STOP_DTMF_RSP, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_STOP_DTMF_RSP, DIRECTION_OUT);
add_trace("keypad", NULL, "%c", mncc->keypad);
end_trace();
resp = create_mncc(MNCC_STOP_DTMF_RSP, p_g_callref);
struct lcr_msg *message;
struct gsm_mncc *resp, *frame;
- gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+ gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
end_trace();
/* notify the hold of call */
message_put(message);
/* acknowledge hold */
- gsm_trace_header(p_g_interface_name, this, MNCC_HOLD_CNF, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_HOLD_CNF, DIRECTION_OUT);
end_trace();
resp = create_mncc(MNCC_HOLD_CNF, p_g_callref);
send_and_free_mncc(p_g_lcr_gsm, resp->msg_type, resp);
/* disable audio */
if (p_g_tch_connected) { /* it should be true */
- gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_DROP, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_FRAME_DROP, DIRECTION_OUT);
end_trace();
frame = create_mncc(MNCC_FRAME_DROP, p_g_callref);
send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame);
struct lcr_msg *message;
struct gsm_mncc *resp, *frame;
- gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+ gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
end_trace();
/* notify the retrieve of call */
message_put(message);
/* acknowledge retr */
- gsm_trace_header(p_g_interface_name, this, MNCC_RETRIEVE_CNF, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_RETRIEVE_CNF, DIRECTION_OUT);
end_trace();
resp = create_mncc(MNCC_RETRIEVE_CNF, p_g_callref);
send_and_free_mncc(p_g_lcr_gsm, resp->msg_type, resp);
/* enable audio */
if (!p_g_tch_connected) { /* it should be true */
- gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
end_trace();
frame = create_mncc(MNCC_FRAME_RECV, p_g_callref);
send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame);
* return the payload type or 0 if not given
*/
-void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_types, int *payloads, int max_payloads)
+void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_types, int *media_types, int *payloads, int max_payloads)
{
+ int media_type;
unsigned char payload_type;
*payloads = 0;
- gsm_trace_header(p_g_interface_name, this, 1 /* codec negotioation */, DIRECTION_NONE);
+ gsm_trace_header(p_interface_name, this, 1 /* codec negotioation */, DIRECTION_NONE);
if ((mncc->fields & MNCC_F_BEARER_CAP)) {
/* select preferred payload type from list */
int i;
+ unsigned char dynamic_type = 96;
add_trace("bearer", "capa", "given by MS");
for (i = 0; mncc->bearer_cap.speech_ver[i] >= 0; i++) {
switch (mncc->bearer_cap.speech_ver[i]) {
case 0:
add_trace("speech", "version", "Full Rate given");
- payload_type = RTP_PT_GSM_FULL;
+ media_type = MEDIA_TYPE_GSM;
+ payload_type = PAYLOAD_TYPE_GSM;
break;
case 2:
add_trace("speech", "version", "EFR given");
- payload_type = RTP_PT_GSM_EFR;
+ media_type = MEDIA_TYPE_GSM_EFR;
+ payload_type = dynamic_type++;
break;
case 4:
add_trace("speech", "version", "AMR given");
- payload_type = RTP_PT_GSM_AMR;
+ media_type = MEDIA_TYPE_AMR;
+ payload_type = dynamic_type++;
break;
case 1:
add_trace("speech", "version", "Half Rate given");
- payload_type = RTP_PT_GSM_HALF;
+ media_type = MEDIA_TYPE_GSM_HR;
+ payload_type = dynamic_type++;
+ break;
+ case 5:
+ add_trace("speech", "version", "AMR Half Rate given");
+ media_type = MEDIA_TYPE_AMR;
+ payload_type = dynamic_type++;
break;
default:
add_trace("speech", "version", "%d given", mncc->bearer_cap.speech_ver[i]);
+ media_type = 0;
payload_type = 0;
}
/* wen don't support it, so we check the next */
- if (!payload_type) {
+ if (!media_type) {
add_trace("speech", "ignored", "Not supported by LCR");
continue;
}
if (!p_g_rtp_bridge) {
- if (payload_type != RTP_PT_GSM_FULL) {
+ if (media_type != MEDIA_TYPE_GSM) {
add_trace("speech", "ignored", "Not suitable for LCR");
continue;
}
}
if (*payloads <= max_payloads) {
+ media_types[*payloads] = media_type;
payload_types[*payloads] = payload_type;
(*payloads)++;
}
} else {
add_trace("bearer", "capa", "not given by MS");
add_trace("speech", "version", "Full Rate given");
- payload_types[0] = RTP_PT_GSM_FULL;
+ media_types[0] = MEDIA_TYPE_GSM;
+ payload_types[0] = PAYLOAD_TYPE_GSM;
*payloads = 1;
}
if (!(*payloads))
struct lcr_msg *message;
struct gsm_mncc *proceeding, *frame;
struct interface *interface;
+ int media_types[8];
unsigned char payload_types[8];
int payloads = 0;
- interface = getinterfacebyname(p_g_interface_name);
+ interface = getinterfacebyname(p_interface_name);
if (!interface) {
- PERROR("Cannot find interface %s.\n", p_g_interface_name);
+ PERROR("Cannot find interface %s.\n", p_interface_name);
return;
}
/* process given callref */
- gsm_trace_header(p_g_interface_name, this, 0, DIRECTION_IN);
+ gsm_trace_header(p_interface_name, this, 0, DIRECTION_IN);
add_trace("callref", "new", "0x%x", 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_g_interface_name, this, MNCC_REJ_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_REJ_REQ, DIRECTION_OUT);
mncc->fields |= MNCC_F_CAUSE;
mncc->cause.coding = 3;
mncc->cause.location = 1;
SCPY(p_callerinfo.imsi, mncc->imsi);
p_callerinfo.screen = INFO_SCREEN_NETWORK;
p_callerinfo.ntype = INFO_NTYPE_UNKNOWN;
- SCPY(p_callerinfo.interface, p_g_interface_name);
+ SCPY(p_callerinfo.interface, p_interface_name);
/* dialing information */
SCAT(p_dialinginfo.id, mncc->called.number);
/* get list of offered payload types
* if list ist empty, the FR V1 is selected */
- select_payload_type(mncc, payload_types, &payloads, sizeof(payload_types));
+ select_payload_type(mncc, payload_types, media_types, &payloads, sizeof(payload_types));
/* if no given payload type is supported, we assume */
if (!payloads) {
- payload_types[0] = RTP_PT_GSM_FULL;
+ media_types[0] = MEDIA_TYPE_GSM;
+ payload_types[0] = PAYLOAD_TYPE_GSM;
payloads = 1;
}
#if 0
/* if no given payload type is supported, we reject the call */
if (!payloads) {
mncc = create_mncc(MNCC_REJ_REQ, callref);
- gsm_trace_header(p_g_interface_name, this, MNCC_REJ_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_REJ_REQ, DIRECTION_OUT);
mncc->fields |= MNCC_F_CAUSE;
mncc->cause.coding = 3;
mncc->cause.location = 1;
/* useruser */
/* what infos did we got ... */
- gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+ gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
if (p_callerinfo.id[0])
add_trace("calling", "number", "%s", p_callerinfo.id);
else
/* modify lchan in case of no rtp bridge */
if (!p_g_rtp_bridge)
- modify_lchan(payload_types[0]);
+ modify_lchan(media_types[0]);
/* send call proceeding */
- gsm_trace_header(p_g_interface_name, this, MNCC_CALL_PROC_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_CALL_PROC_REQ, DIRECTION_OUT);
proceeding = create_mncc(MNCC_CALL_PROC_REQ, p_g_callref);
if (p_g_tones) {
proceeding->fields |= MNCC_F_PROGRESS;
new_state(PORT_STATE_IN_PROCEEDING);
if (p_g_tones && !p_g_tch_connected) { /* only if ... */
- gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
end_trace();
frame = create_mncc(MNCC_FRAME_RECV, p_g_callref);
send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame);
send_and_free_mncc(p_g_lcr_gsm, rtp->msg_type, rtp);
for (i = 0; i < (int)sizeof(message->param.setup.rtpinfo.payload_types) && i < payloads; i++) {
+ message->param.setup.rtpinfo.media_types[i] = media_types[i];
message->param.setup.rtpinfo.payload_types[i] = payload_types[i];
message->param.setup.rtpinfo.payloads++;
}
}
if (msg_type == GSM_TCHF_FRAME
- || msg_type == GSM_TCHF_BAD_FRAME) {
+ || msg_type == GSM_BAD_FRAME) {
if (port) {
/* inject DTMF, if enabled */
if (pgsm_bs->p_g_dtmf) {
/* no GSM MNCC connection */
if (p_g_lcr_gsm->mncc_lfd.fd < 0) {
- gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT);
add_trace("failure", NULL, "No MNCC connection.");
end_trace();
message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
/* no number */
if (!p_dialinginfo.id[0]) {
- gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_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);
int i;
p_g_rtp_payloads = 0;
- gsm_trace_header(p_g_interface_name, this, 1 /* codec negotioation */, DIRECTION_NONE);
+ gsm_trace_header(p_interface_name, this, 1 /* codec negotioation */, DIRECTION_NONE);
for (i = 0; i < param->setup.rtpinfo.payloads; i++) {
- switch (param->setup.rtpinfo.payload_types[i]) {
- case RTP_PT_GSM_FULL:
- case RTP_PT_GSM_EFR:
- case RTP_PT_GSM_AMR:
- case RTP_PT_GSM_HALF:
- add_trace("rtp", "payload", "%d supported", param->setup.rtpinfo.payload_types[i]);
+ switch (param->setup.rtpinfo.media_types[i]) {
+ case MEDIA_TYPE_GSM:
+ case MEDIA_TYPE_GSM_EFR:
+ case MEDIA_TYPE_AMR:
+ case MEDIA_TYPE_GSM_HR:
+ add_trace("rtp", "payload", "%s:%d supported", media_type2name(param->setup.rtpinfo.media_types[i]), param->setup.rtpinfo.payload_types[i]);
if (p_g_rtp_payloads < (int)sizeof(p_g_rtp_payload_types)) {
- p_g_rtp_payload_types[p_g_rtp_payloads++] = param->setup.rtpinfo.payload_types[i];
+ p_g_rtp_media_types[p_g_rtp_payloads] = param->setup.rtpinfo.media_types[i];
+ p_g_rtp_payload_types[p_g_rtp_payloads] = param->setup.rtpinfo.payload_types[i];
p_g_rtp_payloads++;
}
break;
default:
- add_trace("rtp", "payload", "%d unsupported", param->setup.rtpinfo.payload_types[i]);
+ add_trace("rtp", "payload", "%s:%d unsupported", media_type2name(param->setup.rtpinfo.media_types[i]), param->setup.rtpinfo.payload_types[i]);
}
}
end_trace();
if (!p_g_rtp_payloads) {
- gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT);
add_trace("failure", NULL, "No payload given that is supported by GSM");
end_trace();
message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
// 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_g_interface_name);
+ do_screen(1, p_callerinfo.id, sizeof(p_callerinfo.id), &p_callerinfo.ntype, &p_callerinfo.present, p_interface_name);
/* attach only if not already */
epointlist = p_epointlist;
epointlist_new(epoint_id);
/* creating l3id */
- gsm_trace_header(p_g_interface_name, this, 0, DIRECTION_OUT);
+ gsm_trace_header(p_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_g_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_SETUP_REQ, DIRECTION_OUT);
mncc = create_mncc(MNCC_SETUP_REQ, p_g_callref);
/* caller information */
mncc->fields |= MNCC_F_CALLING;
projects / lcr.git / blobdiff