#include "gsm_audio.h"
}
-#include <mISDN/mISDNcompat.h>
#include <assert.h>
#define SOCKET_RETRY_TIMER 5
const char *name;
} mncc_names[] = {
{ 0, "New call ref" },
+ { 1, "Codec negotiation" },
{ MNCC_SETUP_REQ, "MNCC_SETUP_REQ" },
{ MNCC_SETUP_IND, "MNCC_SETUP_IND" },
{ MNCC_SETUP_RSP, "MNCC_SETUP_RSP" },
{ MNCC_STOP_DTMF_REQ, "MNCC_STOP_DTMF_REQ" },
{ MNCC_HOLD_REQ, "MNCC_HOLD_REQ " },
{ MNCC_RETRIEVE_REQ, "MNCC_RETRIEVE_REQ" },
+ { MNCC_LCHAN_MODIFY, "MNCC_LCHAN_MODIFY" },
{ 0, NULL }
};
return ret;
}
+void Pgsm::send_mncc_rtp_connect(void)
+{
+ struct gsm_mncc_rtp *nrtp;
+
+ nrtp = (struct gsm_mncc_rtp *) create_mncc(MNCC_RTP_CONNECT, p_g_callref);
+ nrtp->ip = p_g_rtp_ip_remote;
+ nrtp->port = p_g_rtp_port_remote;
+ switch (p_g_media_type) {
+ case MEDIA_TYPE_GSM:
+ nrtp->payload_msg_type = GSM_TCHF_FRAME;
+ break;
+ case MEDIA_TYPE_GSM_EFR:
+ nrtp->payload_msg_type = GSM_TCHF_FRAME_EFR;
+ break;
+ case MEDIA_TYPE_AMR:
+ nrtp->payload_msg_type = GSM_TCH_FRAME_AMR;
+ break;
+ case MEDIA_TYPE_GSM_HR:
+ nrtp->payload_msg_type = GSM_TCHH_FRAME;
+ break;
+ }
+ nrtp->payload_type = p_g_payload_type;
+ PDEBUG(DEBUG_GSM, "sending MNCC RTP connect with payload_msg_type=%x, payload_type=%d\n", nrtp->payload_msg_type, nrtp->payload_type);
+ send_and_free_mncc(p_g_lcr_gsm, nrtp->msg_type, nrtp);
+}
+
static int delete_event(struct lcr_work *work, void *instance, int index);
/*
p_g_rtp_bridge = 0;
if (interface->rtp_bridge)
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));
}
p_g_rxpos = 0;
p_g_tch_connected = 0;
+ p_g_media_type = 0;
PDEBUG(DEBUG_GSM, "Created new GSMPort(%s).\n", portname);
}
void Pgsm::frame_receive(void *arg)
{
struct gsm_data_frame *frame = (struct gsm_data_frame *)arg;
- signed short samples[160];
unsigned char data[160];
int i;
if (!p_g_decoder)
return;
- if ((frame->data[0]>>4) != 0xd)
- PERROR("received GSM frame with wrong magig 0x%x\n", frame->data[0]>>4);
+ if (frame->msg_type != GSM_BAD_FRAME) {
+ 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_g_decoder, frame->data, samples);
- for (i = 0; i < 160; i++) {
- data[i] = audio_s16_to_law[samples[i] & 0xffff];
+ /* decode */
+ gsm_audio_decode(p_g_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];
+ }
+ } 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];
+ }
}
+ /* local echo */
+ if (p_echotest)
+ bridge_rx(data, 160);
+
/* send to remote*/
bridge_tx(data, 160);
}
/* send traffic to gsm */
int Pgsm::bridge_rx(unsigned char *data, int len)
{
+ if (p_tone_name[0])
+ return -EINVAL;
+
+ return audio_send(data, len);
+}
+
+int Pgsm::audio_send(unsigned char *data, int len)
+{
unsigned char frame[33];
/* encoder init failed */
char msgtext[64];
struct interface *interface = interface_first;
- while (interface) {
- if (!strcmp(interface->name, interface_name))
- break;
- interface = interface->next;
- }
+ interface = getinterfacebyname(interface_name);
if (!interface)
return;
SCAT(msgtext, " ----");
/* init trace with given values */
- start_trace(0,
+ start_trace(-1,
interface,
port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype, options.national, options.international):NULL,
port?port->p_dialinginfo.id:NULL,
msgtext);
}
-/* PROCEEDING INDICATION */
-void Pgsm::call_conf_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc)
+/* modify lchan to given payload type */
+void Pgsm::modify_lchan(int media_type)
{
struct gsm_mncc *mode;
- gsm_trace_header(p_g_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);
- add_trace("cause", "value", "%", mncc->cause.value);
- }
- end_trace();
+ /* already modified to that payload type */
+ if (p_g_media_type == media_type)
+ return;
- /* modify lchan to GSM codec V1 */
+ p_g_media_type = media_type;
gsm_trace_header(p_g_interface_name, this, MNCC_LCHAN_MODIFY, DIRECTION_OUT);
mode = create_mncc(MNCC_LCHAN_MODIFY, p_g_callref);
- mode->lchan_mode = 0x01; /* GSM V1 */
- mode->lchan_type = 0x02;
+ switch (media_type) {
+ case MEDIA_TYPE_GSM_EFR:
+ add_trace("speech", "version", "EFR given");
+ mode->lchan_mode = 0x21; /* GSM V2 */
+ break;
+ case MEDIA_TYPE_AMR:
+ add_trace("speech", "version", "AMR given");
+ mode->lchan_mode = 0x41; /* GSM V3 */
+ break;
+ default:
+ add_trace("speech", "version", "Full/Half Rate given");
+ mode->lchan_mode = 0x01; /* GSM V1 */
+ }
+ mode->lchan_type = 0x02; /* FIXME: unused */
add_trace("mode", NULL, "0x%02x", mode->lchan_mode);
end_trace();
send_and_free_mncc(p_g_lcr_gsm, mode->msg_type, mode);
-
}
-/* CALL PROCEEDING INDICATION */
+/* CALL PROCEEDING INDICATION (from network) */
void Pgsm::call_proc_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc)
{
struct lcr_msg *message;
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->param.connectinfo.rtpinfo.payload_type = 3; /* FIXME: receive payload type from peer */
+
+ /* if we have a bridge, but not yet modified, the phone accepts out requested payload.
+ * we force the first in list */
+ if (p_g_rtp_bridge) {
+ if (!p_g_media_type) {
+ /* modify to first given type */
+ modify_lchan(p_g_rtp_media_types[0]);
+ /* also set payload type */
+ p_g_payload_type = p_g_rtp_payload_types[0];
+ }
+ 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;
+ }
if (p_g_rtp_bridge) {
struct gsm_mncc_rtp *rtp;
p_g_setup_pending = NULL;
}
if (p_g_connect_pending) {
- struct gsm_mncc_rtp *nrtp;
-
PDEBUG(DEBUG_GSM, "Got RTP peer info (%08x,%d) connecting RTP... \n", rtp->ip, rtp->port);
- nrtp = (struct gsm_mncc_rtp *) create_mncc(MNCC_RTP_CONNECT, p_g_callref);
- nrtp->ip = p_g_rtp_ip_remote;
- nrtp->port = p_g_rtp_port_remote;
- send_and_free_mncc(p_g_lcr_gsm, nrtp->msg_type, nrtp);
+ send_mncc_rtp_connect();
}
}
}
if (param->progressinfo.rtpinfo.port) {
- struct gsm_mncc_rtp *rtp;
+ PDEBUG(DEBUG_GSM, "PROGRESS with RTP peer info, sent to BSC (%08x,%d) with media %d, pt %d\n", param->progressinfo.rtpinfo.ip, param->progressinfo.rtpinfo.port, param->progressinfo.rtpinfo.media_types[0], param->progressinfo.rtpinfo.payload_types[0]);
- PDEBUG(DEBUG_GSM, "CONNECT with RTP peer info, sent to BSC (%08x,%d)\n", param->progressinfo.rtpinfo.ip, param->progressinfo.rtpinfo.port);
- rtp = (struct gsm_mncc_rtp *) create_mncc(MNCC_RTP_CONNECT, p_g_callref);
- rtp->ip = param->progressinfo.rtpinfo.ip;
- rtp->port = param->progressinfo.rtpinfo.port;
- send_and_free_mncc(p_g_lcr_gsm, rtp->msg_type, rtp);
+ /* modify channel to givne type, also sets media type */
+ modify_lchan(param->progressinfo.rtpinfo.media_types[0]);
+
+ /* connect RTP */
+ p_g_rtp_ip_remote = param->progressinfo.rtpinfo.ip;
+ p_g_rtp_port_remote = param->progressinfo.rtpinfo.port;
+ /* p_g_media_type is already set by modify_lchan() */
+ p_g_payload_type = param->progressinfo.rtpinfo.payload_types[0];
+ send_mncc_rtp_connect();
}
}
new_state(PORT_STATE_CONNECT_WAITING);
if (param->connectinfo.rtpinfo.port) {
- struct gsm_mncc_rtp *rtp;
-
PDEBUG(DEBUG_GSM, "CONNECT with RTP peer info, sent to BSC (%08x,%d)\n", param->connectinfo.rtpinfo.ip, param->connectinfo.rtpinfo.port);
- rtp = (struct gsm_mncc_rtp *) create_mncc(MNCC_RTP_CONNECT, p_g_callref);
- rtp->ip = param->connectinfo.rtpinfo.ip;
- rtp->port = param->connectinfo.rtpinfo.port;
- send_and_free_mncc(p_g_lcr_gsm, rtp->msg_type, rtp);
- }
+ /* modify channel to givne type, also sets media type */
+ modify_lchan(param->connectinfo.rtpinfo.media_types[0]);
+
+ /* connect RTP */
+ p_g_rtp_ip_remote = param->connectinfo.rtpinfo.ip;
+ p_g_rtp_port_remote = param->connectinfo.rtpinfo.port;
+ /* p_g_media_type is already set by modify_lchan() */
+ p_g_payload_type = param->connectinfo.rtpinfo.payload_types[0];
+ send_mncc_rtp_connect();
+ }
}
/* MESSAGE_DISCONNECT */
int rc;
static char buf[sizeof(struct gsm_mncc)+1024];
struct gsm_mncc *mncc_prim = (struct gsm_mncc *) buf;
+ struct gsm_mncc_hello *hello = (struct gsm_mncc_hello *) buf;
memset(buf, 0, sizeof(buf));
rc = recv(lfd->fd, buf, sizeof(buf), 0);
if (rc < 0)
return rc;
+ /* TODO: size check? */
+ switch (mncc_prim->msg_type) {
+ case MNCC_SOCKET_HELLO:
+ if (hello->version != MNCC_SOCK_VERSION) {
+ PERROR("MNCC version different. BSC version is %u\n", hello->version);
+ mncc_fd_close(lcr_gsm, lfd);
+ return 0;
+ }
+ break;
+ }
+
/* Hand the MNCC message into LCR */
switch (lcr_gsm->type) {
#ifdef WITH_GSM_BS
projects / lcr.git / blobdiff