nrtp->payload_msg_type = GSM_TCHF_FRAME_EFR;
break;
case MEDIA_TYPE_AMR:
- nrtp->payload_msg_type = GSM_TCHF_FRAME_AMR;
+ nrtp->payload_msg_type = GSM_TCH_FRAME_AMR;
break;
case MEDIA_TYPE_GSM_HR:
- nrtp->payload_msg_type = GSM_TCHF_FRAME_HR;
+ nrtp->payload_msg_type = GSM_TCHH_FRAME;
break;
}
nrtp->payload_type = p_g_payload_type;
/*
* constructor
*/
-Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct interface *interface) : Port(type, portname, settings)
+Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct interface *interface) : Port(type, portname, settings, interface)
{
p_g_tones = 0;
if (interface->is_tones == IS_YES)
p_g_rtp_bridge = 1;
p_g_rtp_payloads = 0;
memset(&p_g_samples, 0, sizeof(p_g_samples));
- SCPY(p_g_interface_name, interface->name);
p_callerinfo.itype = (interface->extension)?INFO_ITYPE_ISDN_EXTENSION:INFO_ITYPE_ISDN;
memset(&p_g_delete, 0, sizeof(p_g_delete));
add_work(&p_g_delete, delete_event, this, 0);
p_g_notify_pending = NULL;
p_g_setup_pending = NULL;
p_g_connect_pending = NULL;
- p_g_decoder = gsm_audio_create();
- p_g_encoder = gsm_audio_create();
- if (!p_g_encoder || !p_g_decoder) {
- PERROR("Failed to create GSM audio codec instance\n");
+ p_g_fr_decoder = NULL;
+ p_g_fr_encoder = NULL;
+ p_g_hr_decoder = NULL;
+ p_g_hr_encoder = NULL;
+ p_g_amr_decoder = NULL;
+ p_g_amr_encoder = NULL;
+#ifdef WITH_GSMFR
+ p_g_fr_decoder = gsm_fr_create();
+ p_g_fr_encoder = gsm_fr_create();
+ if (!p_g_fr_encoder || !p_g_fr_decoder) {
+ PERROR("Failed to create GSM FR codec instance\n");
trigger_work(&p_g_delete);
}
+#endif
+#ifdef WITH_GSMAMR
+ p_g_amr_decoder = gsm_amr_create();
+ p_g_amr_encoder = gsm_amr_create();
+ if (!p_g_amr_encoder || !p_g_amr_decoder) {
+ PERROR("Failed to create GSM AMR codec instance\n");
+ trigger_work(&p_g_delete);
+ }
+#endif
p_g_rxpos = 0;
p_g_tch_connected = 0;
p_g_media_type = 0;
if (p_g_connect_pending)
message_free(p_g_connect_pending);
+//#ifdef WITH_GSMFR
+ /* close codec */
+ if (p_g_fr_encoder)
+ gsm_fr_destroy(p_g_fr_encoder);
+ if (p_g_fr_decoder)
+ gsm_fr_destroy(p_g_fr_decoder);
+//#endif
+#ifdef WITH_GSMAMR
/* close codec */
- if (p_g_encoder)
- gsm_audio_destroy(p_g_encoder);
- if (p_g_decoder)
- gsm_audio_destroy(p_g_decoder);
+ if (p_g_amr_encoder)
+ gsm_amr_destroy(p_g_amr_encoder);
+ if (p_g_amr_decoder)
+ gsm_amr_destroy(p_g_amr_decoder);
+#endif
}
unsigned char data[160];
int i;
- if (!p_g_decoder)
+ if (!p_g_fr_decoder)
return;
- if (frame->msg_type != GSM_TCHF_BAD_FRAME) {
- if ((frame->data[0]>>4) != 0xd)
- PERROR("received GSM frame with wrong magig 0x%x\n", frame->data[0]>>4);
-
+ switch (frame->msg_type) {
+ case GSM_TCHF_FRAME:
+ if (p_g_media_type != MEDIA_TYPE_GSM) {
+ PERROR("FR frame, but current media type mismatches.\n");
+ return;
+ }
+ if (!p_g_fr_decoder) {
+ PERROR("FR frame, but decoder not created.\n");
+ return;
+ }
+ if ((frame->data[0]>>4) != 0xd) {
+ PDEBUG(DEBUG_GSM, "received GSM frame with wrong magig 0x%x\n", frame->data[0]>>4);
+ goto bfi;
+ }
+#ifdef WITH_GSMFR
/* decode */
- gsm_audio_decode(p_g_decoder, frame->data, p_g_samples);
+ gsm_fr_decode(p_g_fr_decoder, frame->data, p_g_samples);
for (i = 0; i < 160; i++) {
data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
}
- } else if (p_echotest) {
- /* beep on bad frame */
- for (i = 0; i < 160; i++) {
- if ((i & 3) > 2)
- p_g_samples[i] = 15000;
- else
- p_g_samples[i] = -15000;
- data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
+#endif
+ break;
+ case GSM_TCHF_FRAME_EFR:
+ if (p_g_media_type != MEDIA_TYPE_GSM_EFR) {
+ PERROR("EFR frame, but current media type mismatches.\n");
+ return;
}
- } else {
- /* repeat on bad frame */
+ if (!p_g_amr_decoder) {
+ PERROR("EFR frame, but decoder not created.\n");
+ return;
+ }
+ if ((frame->data[0]>>4) != 0xc)
+ goto bfi;
+#ifdef WITH_GSMAMR
+ /* decode */
+ gsm_efr_decode(p_g_amr_decoder, frame->data, p_g_samples);
for (i = 0; i < 160; i++) {
- p_g_samples[i] = (p_g_samples[i] * 14) >> 4;
data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
}
+#endif
+ break;
+ case GSM_BAD_FRAME:
+ default:
+bfi:
+ if (p_echotest) {
+ /* beep on bad frame */
+ for (i = 0; i < 160; i++) {
+ if ((i & 3) > 2)
+ p_g_samples[i] = 15000;
+ else
+ p_g_samples[i] = -15000;
+ data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
+ }
+ } else {
+ /* repeat on bad frame */
+ for (i = 0; i < 160; i++) {
+ p_g_samples[i] = (p_g_samples[i] * 14) >> 4;
+ data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
+ }
+ }
}
+ /* record data */
+ if (p_record)
+ record(data, 160, 0); // from down
+ if (p_tap)
+ tap(data, 160, 0); // from down
+
/* local echo */
if (p_echotest)
bridge_rx(data, 160);
{
unsigned char frame[33];
+ /* record data */
+ if (p_record)
+ record(data, len, 1); // from up
+ if (p_tap)
+ tap(data, len, 1); // from up
+
/* encoder init failed */
- if (!p_g_encoder)
+ if (!p_g_fr_encoder)
return -EINVAL;
/* (currently) not connected, so don't flood tch! */
/* write to rx buffer */
while(len--) {
p_g_rxdata[p_g_rxpos++] = audio_law_to_s32[*data++];
- if (p_g_rxpos == 160) {
- p_g_rxpos = 0;
-
+ if (p_g_rxpos != 160)
+ continue;
+ p_g_rxpos = 0;
+
+ switch (p_g_media_type) {
+ case MEDIA_TYPE_GSM:
+ if (!p_g_fr_encoder) {
+ PERROR("FR frame, but encoder not created.\n");
+ break;
+ }
+#ifdef WITH_GSMFR
/* encode data */
- gsm_audio_encode(p_g_encoder, p_g_rxdata, frame);
- frame_send(frame);
+ gsm_fr_encode(p_g_fr_encoder, p_g_rxdata, frame);
+ frame_send(frame, 33, GSM_TCHF_FRAME);
+#endif
+ break;
+ case MEDIA_TYPE_GSM_EFR:
+ if (!p_g_amr_encoder) {
+ PERROR("EFR frame, but encoder not created.\n");
+ break;
+ }
+#ifdef WITH_GSMAMR
+ /* encode data */
+ gsm_efr_encode(p_g_amr_encoder, p_g_rxdata, frame);
+ frame_send(frame, 31, GSM_TCHF_FRAME_EFR);
+#endif
+ break;
}
}
return 0;
}
-void Pgsm::frame_send(void *_frame)
+void Pgsm::frame_send(void *_frame, int len, int msg_type)
{
- unsigned char buffer[sizeof(struct gsm_data_frame) + 33];
+ unsigned char buffer[sizeof(struct gsm_data_frame) + len];
struct gsm_data_frame *frame = (struct gsm_data_frame *)buffer;
- frame->msg_type = GSM_TCHF_FRAME;
+ frame->msg_type = msg_type;
frame->callref = p_g_callref;
- memcpy(frame->data, _frame, 33);
+ memcpy(frame->data, _frame, len);
if (p_g_lcr_gsm) {
mncc_send(p_g_lcr_gsm, frame->msg_type, frame);
{
struct gsm_mncc *mode;
- /* already modified to that payload type */
+ /* already modified to that media type */
if (p_g_media_type == media_type)
return;
p_g_media_type = media_type;
- gsm_trace_header(p_g_interface_name, this, MNCC_LCHAN_MODIFY, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_LCHAN_MODIFY, DIRECTION_OUT);
mode = create_mncc(MNCC_LCHAN_MODIFY, p_g_callref);
switch (media_type) {
case MEDIA_TYPE_GSM_EFR:
add_trace("speech", "version", "AMR given");
mode->lchan_mode = 0x41; /* GSM V3 */
break;
- case MEDIA_TYPE_GSM_HR:
- add_trace("speech", "version", "Half Rate given");
- mode->lchan_mode = 0x05; /* GSM V1 HR */
- break;
default:
- add_trace("speech", "version", "Full Rate given");
+ add_trace("speech", "version", "Full/Half Rate given");
mode->lchan_mode = 0x01; /* GSM V1 */
}
mode->lchan_type = 0x02; /* FIXME: unused */
struct lcr_msg *message;
struct gsm_mncc *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();
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROCEEDING);
new_state(PORT_STATE_OUT_PROCEEDING);
if (p_g_earlyb && !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);
p_g_tch_connected = 1;
}
+
+ /* modify to GSM FR (this is GSM user side only, so there is FR supported only) */
+ modify_lchan(MEDIA_TYPE_GSM);
}
/* ALERTING INDICATION */
struct lcr_msg *message;
struct gsm_mncc *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();
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_ALERTING);
new_state(PORT_STATE_OUT_ALERTING);
if (p_g_earlyb && !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);
p_g_tch_connected = 1;
}
+
+ /* modify to GSM FR, if not already */
+ if (!p_g_media_type) {
+ modify_lchan(MEDIA_TYPE_GSM);
+ }
}
/* CONNECT INDICATION */
p_connectinfo.present = INFO_PRESENT_ALLOWED;
p_connectinfo.screen = INFO_SCREEN_NETWORK;
p_connectinfo.ntype = INFO_NTYPE_UNKNOWN;
- SCPY(p_connectinfo.interface, p_g_interface_name);
+ SCPY(p_connectinfo.interface, p_interface_name);
- 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_connectinfo.id[0])
add_trace("connect", "number", "%s", p_connectinfo.id);
else if (mncc->imsi[0])
end_trace();
/* send resp */
- gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_COMPL_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_SETUP_COMPL_REQ, DIRECTION_OUT);
resp = create_mncc(MNCC_SETUP_COMPL_REQ, p_g_callref);
end_trace();
send_and_free_mncc(p_g_lcr_gsm, resp->msg_type, resp);
new_state(PORT_STATE_CONNECT);
if (!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);
message->param.connectinfo.rtpinfo.media_types[0] = p_g_media_type;
message->param.connectinfo.rtpinfo.payload_types[0] = p_g_payload_type;
message->param.connectinfo.rtpinfo.payloads = 1;
+ } else {
+ /* modify to GSM FR, if not already
+ * for network side, this should have been already happened */
+ if (!p_g_media_type)
+ modify_lchan(MEDIA_TYPE_GSM);
}
+
if (p_g_rtp_bridge) {
struct gsm_mncc_rtp *rtp;
{
struct gsm_mncc *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();
new_state(PORT_STATE_CONNECT);
if (!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);
int cause = 16, location = 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);
if (mncc->fields & MNCC_F_CAUSE) {
location = mncc->cause.location;
cause = mncc->cause.value;
/* send release */
resp = 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);
#if 0
resp->fields |= MNCC_F_CAUSE;
resp->cause.coding = 3;
int location = 0, cause = 16;
struct lcr_msg *message;
- 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) {
location = mncc->cause.location;
cause = mncc->cause.value;
{
struct lcr_msg *message;
- 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("notify", NULL, "%d", mncc->notify);
end_trace();
memcpy(&p_g_notify_pending->param, param, sizeof(union parameter));
} else {
/* sending notification */
- gsm_trace_header(p_g_interface_name, this, MNCC_NOTIFY_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_NOTIFY_REQ, DIRECTION_OUT);
add_trace("notify", NULL, "%d", notify);
end_trace();
mncc = create_mncc(MNCC_NOTIFY_REQ, p_g_callref);
struct gsm_mncc *mncc;
/* send alert */
- gsm_trace_header(p_g_interface_name, this, MNCC_ALERT_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_ALERT_REQ, DIRECTION_OUT);
mncc = create_mncc(MNCC_ALERT_REQ, p_g_callref);
if (p_g_tones) {
mncc->fields |= MNCC_F_PROGRESS;
new_state(PORT_STATE_IN_ALERTING);
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();
mncc = create_mncc(MNCC_FRAME_RECV, p_g_callref);
send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
/* copy connected information */
memcpy(&p_connectinfo, ¶m->connectinfo, sizeof(p_connectinfo));
/* screen outgoing caller id */
- do_screen(1, p_connectinfo.id, sizeof(p_connectinfo.id), &p_connectinfo.ntype, &p_connectinfo.present, p_g_interface_name);
+ do_screen(1, p_connectinfo.id, sizeof(p_connectinfo.id), &p_connectinfo.ntype, &p_connectinfo.present, p_interface_name);
/* send connect */
mncc = create_mncc(MNCC_SETUP_RSP, p_g_callref);
- gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_RSP, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_SETUP_RSP, DIRECTION_OUT);
/* caller information */
mncc->fields |= MNCC_F_CONNECTED;
mncc->connected.plan = 1;
/* send disconnect */
mncc = create_mncc(MNCC_DISC_REQ, p_g_callref);
- gsm_trace_header(p_g_interface_name, this, MNCC_DISC_REQ, DIRECTION_OUT);
+ gsm_trace_header(p_interface_name, this, MNCC_DISC_REQ, DIRECTION_OUT);
if (p_g_tones) {
mncc->fields |= MNCC_F_PROGRESS;
mncc->progress.coding = 3; /* GSM */
new_state(PORT_STATE_OUT_DISCONNECT);
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();
mncc = create_mncc(MNCC_FRAME_RECV, p_g_callref);
send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
/* 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 = param->disconnectinfo.location;
projects / lcr.git / blobdiff