X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm.cpp;h=a4a220eca111c954c33f27f05600da38f7240da2;hp=63f75455dd276366dba6ef935fb10c8c6d7ce010;hb=e1e9da7d24ccce07ae54d671cde5e07dfc827e25;hpb=57defecea870c265179b69f811416c7a4659b0ee

diff --git a/gsm.cpp b/gsm.cpp
index 63f7545..a4a220e 100644
--- a/gsm.cpp
+++ b/gsm.cpp
@@ -35,6 +35,7 @@ static const struct _value_string {
 	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" },
@@ -82,6 +83,7 @@ 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" },
 	{ 0,			NULL }
 };
 
@@ -123,6 +125,32 @@ int send_and_free_mncc(struct lcr_gsm *lcr_gsm, unsigned int msg_type, void *dat
 	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_TCHF_FRAME_AMR;
+		break;
+	case MEDIA_TYPE_GSM_HR:
+		nrtp->payload_msg_type = GSM_TCHF_FRAME_HR;
+		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);
 
 /*
@@ -139,6 +167,7 @@ Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct inte
 	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;
@@ -161,6 +190,7 @@ Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct inte
 	}
 	p_g_rxpos = 0;
 	p_g_tch_connected = 0;
+	p_g_media_type = 0;
 
 	PDEBUG(DEBUG_GSM, "Created new GSMPort(%s).\n", portname);
 }
@@ -315,7 +345,7 @@ void gsm_trace_header(const char *interface_name, class Pgsm *port, unsigned int
 		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,
@@ -325,31 +355,42 @@ void gsm_trace_header(const char *interface_name, class Pgsm *port, unsigned int
 		    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;
+	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");
+		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;
@@ -435,7 +476,20 @@ void Pgsm::setup_cnf(unsigned int msg_type, unsigned int callref, struct gsm_mnc
 
 	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;
@@ -599,13 +653,8 @@ void Pgsm::rtp_create_ind(unsigned int msg_type, unsigned int callref, struct gs
 		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();
 	}
 }
 
@@ -634,13 +683,17 @@ void Pgsm::message_progress(unsigned int epoint_id, int message_id, union parame
 	}
 
 	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();
 	}
 }
 
@@ -741,15 +794,18 @@ void Pgsm::message_connect(unsigned int epoint_id, int message_id, union paramet
 	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 */