X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mncc.h;h=998e91b1064e33201e13fb5c1453b0af9042b320;hp=d543b5486198855517b519064c8f7cfcd860e669;hb=fde8d821548b69c1005cab2a5c414b916348c023;hpb=fa5274af2bf2566e60b8ea5c8069f62aadbb97db

diff --git a/mncc.h b/mncc.h
index d543b54..998e91b 100644
--- a/mncc.h
+++ b/mncc.h
@@ -1,4 +1,6 @@
 
+#include <stdint.h>
+
 #define MNCC_SETUP_REQ		0x0101
 #define MNCC_SETUP_IND		0x0102
 #define MNCC_SETUP_RSP		0x0103
@@ -60,6 +62,7 @@
 #define GSM_TCHF_FRAME_EFR	0x0301
 #define GSM_TCHH_FRAME		0x0302
 #define GSM_TCH_FRAME_AMR	0x0303
+#define ANALOG_8000HZ		0x0380
 #define GSM_BAD_FRAME		0x03ff
 
 #define MNCC_SOCKET_HELLO	0x0400
@@ -187,6 +190,7 @@ enum gsm48_bcap_speech_ver {
 	GSM48_BCAP_SV_EFR	= 2,
 	GSM48_BCAP_SV_AMR_F	= 4,
 	GSM48_BCAP_SV_AMR_H	= 5,
+	BCAP_SV_ANALOG_8000HZ	= 0x80,
 };
 
 /* Expanded fields from GSM TS 04.08, Table 10.5.102 */
@@ -277,11 +281,11 @@ enum {
 
 struct gsm_mncc {
 	/* context based information */
-	u_int32_t	msg_type;
-	u_int32_t	callref;
+	uint32_t	msg_type;
+	uint32_t	callref;
 
 	/* which fields are present */
-	u_int32_t	fields;
+	uint32_t	fields;
 
 	/* data derived informations (MNCC_F_ based) */
 	struct gsm_mncc_bearer_cap	bearer_cap;
@@ -313,8 +317,8 @@ struct gsm_mncc {
 };
 
 struct gsm_data_frame {
-	u_int32_t	msg_type;
-	u_int32_t	callref;
+	uint32_t	msg_type;
+	uint32_t	callref;
 	unsigned char	data[0];
 };
 
@@ -328,8 +332,18 @@ struct gsm_mncc_rtp {
 };
 
 
-#define MNCC_SOCK_VERSION	1
+#define MNCC_SOCK_VERSION	5
 struct gsm_mncc_hello {
-	u_int32_t	msg_type;
-	u_int32_t	version;
+	uint32_t	msg_type;
+	uint32_t	version;
+
+	/* send the sizes of the structs */
+	uint32_t	mncc_size;
+	uint32_t	data_frame_size;
+
+	/* send some offsets */
+	uint32_t	called_offset;
+	uint32_t	signal_offset;
+	uint32_t	emergency_offset;
+	uint32_t	lchan_type_offset;
 };