Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch

src/mod/endpoints/mod_skinny/mod_skinny.c

@@ -1142,7 +1142,7 @@ switch_status_t channel_answer_channel(switch_core_session_t *session)
 		/* Wait for media */
 		while(!switch_test_flag(tech_pvt, TFLAG_IO)) {
 			switch_cond_next();
-			if (++x > 1000) {
+			if (++x > 5000) {
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Wait tooo long to answer %s:%s\n",
 						switch_channel_get_variable(channel, "skinny_device_name"), switch_channel_get_variable(channel, "skinny_device_instance"));
 				return SWITCH_STATUS_FALSE;

src/mod/endpoints/mod_skinny/skinny_protocol.c

@@ -911,6 +911,7 @@ switch_status_t perform_send_open_receive_channel(listener_t *listener,
 	message->data.open_receive_channel.echo_cancel_type = echo_cancel_type;
 	message->data.open_receive_channel.g723_bitrate = g723_bitrate;
 	message->data.open_receive_channel.conference_id2 = conference_id2;
+	message->data.open_receive_channel.rtptimeout = htonl(0x0a);
 	/*
 	   message->data.open_receive_channel.reserved[0] = reserved[0];
 	   message->data.open_receive_channel.reserved[1] = reserved[1];

src/mod/endpoints/mod_skinny/skinny_protocol.h

@@ -458,7 +458,7 @@ struct PACKED dialed_phone_book_message {
 struct PACKED accessory_status_message {
 	uint32_t accessory_id;
 	uint32_t accessory_status;
-	uint32_t unknown;
+	/* uint32_t unknown; */ /* this field is missing in 7925G */
 };
 
 /* RegisterAckMessage */
@@ -683,7 +683,9 @@ struct PACKED open_receive_channel_message {
 	uint32_t echo_cancel_type;
 	uint32_t g723_bitrate;
 	uint32_t conference_id2;
-	uint32_t reserved[10];
+	uint32_t reserved[14];
+	uint32_t rtpdtmfpayload;
+	uint32_t rtptimeout;
 };
 
 /* CloseReceiveChannelMessage */

src/mod/endpoints/mod_skinny/skinny_server.c

@@ -802,7 +802,7 @@ switch_status_t skinny_session_start_media(switch_core_session_t *session, liste
 				SKINNY_CODEC_ULAW_64K, /* uint32_t payload_capacity, */
 				0, /* uint32_t echo_cancel_type, */
 				0, /* uint32_t g723_bitrate, */
-				0, /* uint32_t conference_id2, */
+				tech_pvt->call_id, /* uint32_t conference_id2, */
 				0 /* uint32_t reserved[10] */
 				);
 	}
@@ -868,7 +868,7 @@ switch_status_t skinny_session_unhold_line(switch_core_session_t *session, liste
 		SKINNY_CODEC_ULAW_64K, /* uint32_t payload_capacity, */
 		0, /* uint32_t echo_cancel_type, */
 		0, /* uint32_t g723_bitrate, */
-		0, /* uint32_t conference_id2, */
+		tech_pvt->call_id, /* uint32_t conference_id2, */
 		0 /* uint32_t reserved[10] */
 		);