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

diff --git a/gsm.cpp b/gsm.cpp
index 5fbbd49..b9b88ee 100644
--- a/gsm.cpp
+++ b/gsm.cpp
@@ -290,6 +290,15 @@ void Pgsm::frame_receive(void *arg)
 		return;
 
 	switch (frame->msg_type) {
+	case ANALOG_8000HZ:
+		if (p_g_media_type != MEDIA_TYPE_ANALOG) {
+			PERROR("'Analog' frame, but current media type mismatches.\n");
+			return;
+		}
+		for (i = 0; i < 160; i++) {
+			data[i] = audio_s16_to_law[((int16_t *)frame->data)[i] & 0xffff];
+		}
+		break;
 	case GSM_TCHF_FRAME:
 		if (p_g_media_type != MEDIA_TYPE_GSM) {
 			PERROR("FR frame, but current media type mismatches.\n");
@@ -412,6 +421,11 @@ bfi:
 /* send traffic to gsm */
 int Pgsm::bridge_rx(unsigned char *data, int len)
 {
+	int ret;
+
+	if ((ret = Port::bridge_rx(data, len)))
+		return ret;
+
 	if (p_tone_name[0])
 		return -EINVAL;
 
@@ -445,6 +459,9 @@ int Pgsm::audio_send(unsigned char *data, int len)
 		p_g_rxpos = 0;
 
 		switch (p_g_media_type) {
+		case MEDIA_TYPE_ANALOG:
+			frame_send(p_g_rxdata, 320, ANALOG_8000HZ);
+			break;
 		case MEDIA_TYPE_GSM:
 			if (!p_g_fr_encoder) {
 				PERROR("FR frame, but encoder not created.\n");
@@ -1249,6 +1266,9 @@ static int mncc_send(struct lcr_gsm *lcr_gsm, int msg_type, void *data)
 
 	/* FIXME: the caller should provide this */
 	switch (msg_type) {
+	case ANALOG_8000HZ:
+		len = sizeof(struct gsm_data_frame) + 320;
+		break;
 	case GSM_TCHF_FRAME:
 		len = sizeof(struct gsm_data_frame) + 33;
 		break;
@@ -1275,11 +1295,11 @@ static int mncc_fd_close(struct lcr_gsm *lcr_gsm, struct lcr_fd *lfd)
 	/* free all the calls that were running through the MNCC interface */
 	port = port_first;
 	while(port) {
-		if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_GSM) {
+		if ((port->p_type & PORT_CLASS_MASK) == PORT_CLASS_GSM) {
 			pgsm = (class Pgsm *)port;
 			if (pgsm->p_g_lcr_gsm == lcr_gsm) {
 				message = message_create(pgsm->p_serial, ACTIVE_EPOINT(pgsm->p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
-				message->param.disconnectinfo.cause = 27; // temp. unavail.
+				message->param.disconnectinfo.cause = 41; // temp. fail.
 				message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
 				message_put(message);
 				pgsm->new_state(PORT_STATE_RELEASE);
@@ -1351,6 +1371,34 @@ static int mncc_fd_read(struct lcr_fd *lfd, void *inst, int idx)
 			mncc_fd_close(lcr_gsm, lfd);
 			return 0;
 		}
+		if (hello->mncc_size != sizeof(struct gsm_mncc)) {
+			PERROR("MNCC gsm_mncc size differs: %u %u\n",
+				hello->mncc_size, sizeof(struct gsm_mncc));
+			mncc_fd_close(lcr_gsm, lfd);
+			return 0;
+		}
+		if (hello->data_frame_size != sizeof(struct gsm_data_frame)) {
+			PERROR("MNCC gsm_mncc size differs: %u %u\n",
+				hello->data_frame_size, sizeof(struct gsm_data_frame));
+			mncc_fd_close(lcr_gsm, lfd);
+			return 0;
+		}
+
+#define CHECK_OFFSET(hello, field, lcr_gsm, lfd)	\
+		if (hello->field ##_offset != __builtin_offsetof(struct gsm_mncc, field)) {	\
+			PERROR("MNCC gsm_mncc offset of %s is %u %u\n",				\
+				#field, hello->field ##_offset,					\
+				__builtin_offsetof(struct gsm_mncc, field));			\
+			mncc_fd_close(lcr_gsm, lfd);						\
+			return 0;								\
+		}
+
+		CHECK_OFFSET(hello, called, lcr_gsm, lfd);
+		CHECK_OFFSET(hello, signal, lcr_gsm, lfd);
+		CHECK_OFFSET(hello, emergency, lcr_gsm, lfd);
+		CHECK_OFFSET(hello, lchan_type, lcr_gsm, lfd);
+#undef CHECK_OFFSET
+
 		break;
 	}