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, media_types, &payloads, sizeof(payload_types));
- /* if no given payload type is supported, we assume */
+ /* if no given payload type is supported, we select from channel type */
if (!payloads) {
- media_types[0] = MEDIA_TYPE_GSM;
- payload_types[0] = PAYLOAD_TYPE_GSM;
- payloads = 1;
+ switch (mncc->lchan_type) {
+ case GSM_LCHAN_TCH_F:
+ media_types[0] = MEDIA_TYPE_GSM;
+ payload_types[0] = PAYLOAD_TYPE_GSM;
+ payloads = 1;
+ break;
+ case GSM_LCHAN_TCH_H:
+ media_types[0] = MEDIA_TYPE_GSM_HR;
+ payload_types[0] = 96; /* dynamic */
+ payloads = 1;
+ break;
+ default:
+ mncc = create_mncc(MNCC_REL_REQ, callref);
+ gsm_trace_header(p_interface_name, this, MNCC_REL_REQ, DIRECTION_OUT);
+ mncc->fields |= MNCC_F_CAUSE;
+ mncc->cause.coding = 3;
+ mncc->cause.location = 1;
+ mncc->cause.value = 65;
+ 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, "Given lchan not supported");
+ end_trace();
+ send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
+ new_state(PORT_STATE_RELEASE);
+ trigger_work(&p_g_delete);
+ return;
+ }
}
/* select first payload type that matches the rtp list */
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;
{
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);
{
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);
{
int media_type;
unsigned char payload_type;
+ int half;
+ void *encoder, *decoder;
*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;
add_trace("bearer", "capa", "given by MS");
for (i = 0; mncc->bearer_cap.speech_ver[i] >= 0; i++) {
+ half = 0;
/* select payload type we support */
switch (mncc->bearer_cap.speech_ver[i]) {
case 0:
add_trace("speech", "version", "Full Rate given");
media_type = MEDIA_TYPE_GSM;
payload_type = PAYLOAD_TYPE_GSM;
+ encoder = p_g_fr_encoder;
+ decoder = p_g_fr_decoder;
break;
case 2:
add_trace("speech", "version", "EFR given");
media_type = MEDIA_TYPE_GSM_EFR;
payload_type = dynamic_type++;
+ encoder = p_g_amr_encoder;
+ decoder = p_g_amr_decoder;
break;
case 4:
add_trace("speech", "version", "AMR given");
media_type = MEDIA_TYPE_AMR;
payload_type = dynamic_type++;
+ encoder = p_g_amr_encoder;
+ decoder = p_g_amr_decoder;
break;
case 1:
add_trace("speech", "version", "Half Rate given");
media_type = MEDIA_TYPE_GSM_HR;
payload_type = dynamic_type++;
+ encoder = p_g_hr_encoder;
+ decoder = p_g_hr_decoder;
+ half = 1;
break;
case 5:
add_trace("speech", "version", "AMR Half Rate given");
media_type = MEDIA_TYPE_AMR;
payload_type = dynamic_type++;
+ encoder = p_g_amr_encoder;
+ decoder = p_g_amr_decoder;
+ half = 1;
break;
default:
add_trace("speech", "version", "%d given", mncc->bearer_cap.speech_ver[i]);
add_trace("speech", "ignored", "Not supported by LCR");
continue;
}
+ if (!half && mncc->lchan_type != GSM_LCHAN_TCH_F) {
+ add_trace("speech", "ignored", "Not TCH/F");
+ continue;
+ }
+ if (half && mncc->lchan_type != GSM_LCHAN_TCH_H) {
+ add_trace("speech", "ignored", "Not TCH/H");
+ continue;
+ }
if (!p_g_rtp_bridge) {
- if (media_type != MEDIA_TYPE_GSM) {
- add_trace("speech", "ignored", "Not suitable for LCR");
+ if (!encoder || !decoder) {
+ add_trace("speech", "ignored", "Codec not supported");
continue;
}
}
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, media_types, &payloads, sizeof(payload_types));
- /* if no given payload type is supported, we assume */
+ /* if no given payload type is supported, we select from channel type */
if (!payloads) {
- media_types[0] = MEDIA_TYPE_GSM;
- payload_types[0] = PAYLOAD_TYPE_GSM;
- payloads = 1;
+ switch (mncc->lchan_type) {
+ case GSM_LCHAN_TCH_F:
+ media_types[0] = MEDIA_TYPE_GSM;
+ payload_types[0] = PAYLOAD_TYPE_GSM;
+ payloads = 1;
+ break;
+ case GSM_LCHAN_TCH_H:
+ media_types[0] = MEDIA_TYPE_GSM_HR;
+ payload_types[0] = 96; /* dynamic */
+ payloads = 1;
+ break;
+ default:
+ mncc = create_mncc(MNCC_REJ_REQ, callref);
+ 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;
+ mncc->cause.value = 65;
+ 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, "Given lchan not supported");
+ end_trace();
+ send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
+ new_state(PORT_STATE_RELEASE);
+ trigger_work(&p_g_delete);
+ return;
+ }
}
#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);
- mncc->fields |= MNCC_F_CAUSE;
- mncc->cause.coding = 3;
- mncc->cause.location = 1;
- mncc->cause.value = 65;
- 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, "Given speech codec(s) not supported");
- end_trace();
- send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
- new_state(PORT_STATE_RELEASE);
- trigger_work(&p_g_delete);
- return;
}
#endif
/* 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(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);
}
if (msg_type == GSM_TCHF_FRAME
+ || msg_type == GSM_TCHF_FRAME_EFR
+ || msg_type == GSM_TCHH_FRAME
+ || msg_type == GSM_TCH_FRAME_AMR
|| msg_type == GSM_BAD_FRAME) {
if (port) {
/* inject DTMF, if enabled */
struct lcr_msg *message;
struct epoint_list *epointlist;
struct gsm_mncc *mncc;
+ struct interface *interface;
+
+ interface = getinterfacebyname(p_interface_name);
+ if (!interface) {
+ PERROR("Cannot find interface %s.\n", p_interface_name);
+ return;
+ }
/* copy setup infos to port */
memcpy(&p_callerinfo, ¶m->setup.callerinfo, sizeof(p_callerinfo));
/* 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.media_types[i]) {
case MEDIA_TYPE_GSM:
}
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;
add_trace("redir", "number", "%s", mncc->redirecting.number);
}
+ if (interface->gsm_bs_hr) {
+ add_trace("lchan", "type", "TCH/H or TCH/F");
+ mncc->lchan_type = GSM_LCHAN_TCH_H;
+ } else {
+ add_trace("lchan", "type", "TCH/F");
+ mncc->lchan_type = GSM_LCHAN_TCH_F;
+ }
+
end_trace();
send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
projects / lcr.git / blobdiff