X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm.cpp;h=5fbbd4960efafe70a2debe296a202b5c76636ff3;hp=7502eedf8c2c55efefe3741187c1fa57aca583d0;hb=fa5274af2bf2566e60b8ea5c8069f62aadbb97db;hpb=9b2cabced47630e31cfc57c1384af805170b6d2f

diff --git a/gsm.cpp b/gsm.cpp
index 7502eed..5fbbd49 100644
--- a/gsm.cpp
+++ b/gsm.cpp
@@ -82,20 +82,31 @@ static const struct _value_string {
 	{ 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" },
+
+	{ MNCC_BRIDGE,		"MNCC_BRIDGE" },
+	{ MNCC_FRAME_RECV,	"MNCC_FRAME_RECV" },
+	{ MNCC_FRAME_DROP,	"MNCC_FRAME_DROP" },
+	{ MNCC_RTP_CREATE,	"MNCC_RTP_CREATE" },
+	{ MNCC_RTP_CONNECT,	"MNCC_RTP_CONNECT" },
+	{ MNCC_RTP_FREE,	"MNCC_RTP_FREE" },
+
 	{ 0,			NULL }
 };
 
 const char *mncc_name(int value)
 {
 	int i = 0;
+	static char ukn[32];
 
 	while (mncc_names[i].name) {
 		if (mncc_names[i].msg_type == value)
 			return mncc_names[i].name;
 		i++;
 	}
-	return "unknown";
+	SPRINT(ukn, "unknown(0x%x)", value);
+	return ukn;
 }
 
 static int mncc_send(struct lcr_gsm *lcr_gsm, int msg_type, void *data);
@@ -157,6 +168,11 @@ static int delete_event(struct lcr_work *work, void *instance, int index);
  */
 Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct interface *interface) : Port(type, portname, settings, interface)
 {
+#ifdef WITH_GSMHR
+	signed short homing[160];
+	int i;
+#endif
+
 	p_g_tones = 0;
 	if (interface->is_tones == IS_YES)
 		p_g_tones = 1;
@@ -186,6 +202,8 @@ Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct inte
 	p_g_hr_encoder = NULL;
 	p_g_amr_decoder = NULL;
 	p_g_amr_encoder = NULL;
+	p_g_amr_cmr = 0;
+	p_g_amr_cmr_valid = 0;
 #ifdef WITH_GSMFR
 	p_g_fr_decoder = gsm_fr_create();
 	p_g_fr_encoder = gsm_fr_create();
@@ -194,6 +212,18 @@ Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct inte
 		trigger_work(&p_g_delete);
 	}
 #endif
+#ifdef WITH_GSMHR
+	p_g_hr_decoder = gsm_hr_create();
+	p_g_hr_encoder = gsm_hr_create();
+	if (!p_g_hr_encoder || !p_g_hr_decoder) {
+		PERROR("Failed to create GSM HR codec instance\n");
+		trigger_work(&p_g_delete);
+	}
+	/* Homing */
+	for (i = 0; i < 160; i++)
+		homing[i] = 0x0008;
+	gsm_hr_encode(p_g_hr_encoder, homing, NULL);
+#endif
 #ifdef WITH_GSMAMR
 	p_g_amr_decoder = gsm_amr_create();
 	p_g_amr_encoder = gsm_amr_create();
@@ -233,6 +263,12 @@ Pgsm::~Pgsm()
 	if (p_g_fr_decoder)
 		gsm_fr_destroy(p_g_fr_decoder);
 //#endif
+#ifdef WITH_GSMHR
+	if (p_g_hr_encoder)
+		gsm_hr_destroy(p_g_hr_encoder);
+	if (p_g_hr_decoder)
+		gsm_hr_destroy(p_g_hr_decoder);
+#endif
 #ifdef WITH_GSMAMR
 	/* close codec */
 	if (p_g_amr_encoder)
@@ -248,7 +284,7 @@ void Pgsm::frame_receive(void *arg)
 {
 	struct gsm_data_frame *frame = (struct gsm_data_frame *)arg;
 	unsigned char data[160];
-	int i;
+	int i, cmr;
 
 	if (!p_g_fr_decoder)
 		return;
@@ -275,6 +311,26 @@ void Pgsm::frame_receive(void *arg)
 		}
 #endif
 		break;
+	case GSM_TCHH_FRAME:
+		if (p_g_media_type != MEDIA_TYPE_GSM_HR) {
+			PERROR("HR frame, but current media type mismatches.\n");
+			return;
+		}
+		if (!p_g_hr_decoder) {
+			PERROR("HR frame, but decoder not created.\n");
+			return;
+		}
+		if ((frame->data[0]>>4) != 0x0)
+			goto bfi;
+#ifdef WITH_GSMHR
+		/* decode */
+		if (gsm_hr_decode(p_g_hr_decoder, frame->data, p_g_samples))
+			goto bfi;
+		for (i = 0; i < 160; i++) {
+			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");
@@ -294,6 +350,30 @@ void Pgsm::frame_receive(void *arg)
 		}
 #endif
 		break;
+	case GSM_TCH_FRAME_AMR:
+		if (p_g_media_type != MEDIA_TYPE_AMR) {
+			PERROR("AMR frame, but current media type mismatches.\n");
+			return;
+		}
+		if (!p_g_amr_decoder) {
+			PERROR("AMR frame, but decoder not created.\n");
+			return;
+		}
+		cmr = (frame->data[1] >> 4);
+		if (cmr <= 7) {
+			p_g_amr_cmr = cmr;
+			p_g_amr_cmr_valid = 1;
+		}
+		if (!(frame->data[2] & 0x04))
+			goto bfi;
+#ifdef WITH_GSMAMR
+		/* decode (skip length byte in front) */
+		gsm_amr_decode(p_g_amr_decoder, frame->data + 1, p_g_samples);
+		for (i = 0; i < 160; i++) {
+			data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
+		}
+#endif
+		break;
 	case GSM_BAD_FRAME:
 	default:
 bfi:
@@ -341,6 +421,7 @@ int Pgsm::bridge_rx(unsigned char *data, int len)
 int Pgsm::audio_send(unsigned char *data, int len)
 {
 	unsigned char frame[33];
+	int ret;
 
 	/* record data */
 	if (p_record)
@@ -375,6 +456,17 @@ int Pgsm::audio_send(unsigned char *data, int len)
 			frame_send(frame, 33, GSM_TCHF_FRAME);
 #endif
 			break;
+		case MEDIA_TYPE_GSM_HR:
+			if (!p_g_hr_encoder) {
+				PERROR("HR frame, but encoder not created.\n");
+				break;
+			}
+#ifdef WITH_GSMHR
+			/* encode data */
+			gsm_hr_encode(p_g_hr_encoder, p_g_rxdata, frame);
+			frame_send(frame, 15, GSM_TCHH_FRAME);
+#endif
+			break;
 		case MEDIA_TYPE_GSM_EFR:
 			if (!p_g_amr_encoder) {
 				PERROR("EFR frame, but encoder not created.\n");
@@ -386,6 +478,22 @@ int Pgsm::audio_send(unsigned char *data, int len)
 			frame_send(frame, 31, GSM_TCHF_FRAME_EFR);
 #endif
 			break;
+		case MEDIA_TYPE_AMR:
+			if (!p_g_amr_encoder) {
+				PERROR("AMR frame, but encoder not created.\n");
+				break;
+			}
+			if (!p_g_amr_cmr_valid) {
+				PDEBUG(DEBUG_GSM, "no valid CMR yet.\n");
+				break;
+			}
+#ifdef WITH_GSMAMR
+			/* encode data (prefix a length byte) */
+			ret = gsm_amr_encode(p_g_amr_encoder, p_g_rxdata, frame + 1, p_g_amr_cmr);
+			frame[0] = ret;
+			frame_send(frame, ret + 1, GSM_TCH_FRAME_AMR);
+#endif
+			break;
 		}
 	}
 
@@ -621,6 +729,11 @@ void Pgsm::setup_compl_ind(unsigned int msg_type, unsigned int callref, struct g
 		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);
+	}
 }
 
 /* DISCONNECT INDICATION */
@@ -828,6 +941,11 @@ void Pgsm::message_alerting(unsigned int epoint_id, int message_id, union parame
 		send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
 		p_g_tch_connected = 1;
 	}
+
+	/* modify to GSM FR, if not already */
+	if (!p_g_media_type) {
+		modify_lchan(MEDIA_TYPE_GSM);
+	}
 }
 
 /* MESSAGE_CONNECT */
@@ -1216,6 +1334,7 @@ static int mncc_fd_read(struct lcr_fd *lfd, void *inst, int idx)
 	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);
@@ -1224,6 +1343,17 @@ static int mncc_fd_read(struct lcr_fd *lfd, void *inst, int idx)
 	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