[asterisk-commits] kpfleming: trunk r350791 - in /trunk: ./ addons/ channels/ contrib/scripts/ res/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sat Jan 14 09:51:48 CST 2012


Author: kpfleming
Date: Sat Jan 14 09:51:43 2012
New Revision: 350791

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=350791
Log:
Multiple revisions 350788-350789

........
  r350788 | kpfleming | 2012-01-14 09:22:33 -0600 (Sat, 14 Jan 2012) | 8 lines
  
  Ensure that two prerequisites are properly installed on Debian-style distributions.
  
  * Don't specify a specific version of libgmime; newer versions are available
    now and acceptable.
  
  * Install libsrtp so that res_srtp can be built.
........
  r350789 | kpfleming | 2012-01-14 09:23:32 -0600 (Sat, 14 Jan 2012) | 3 lines
  
  Correct some 'set-but-not-used' variable warnings.
........

Merged revisions 350788-350789 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 350790 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/addons/chan_mobile.c
    trunk/channels/chan_h323.c
    trunk/contrib/scripts/install_prereq
    trunk/res/res_pktccops.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_mobile.c?view=diff&rev=350791&r1=350790&r2=350791
==============================================================================
--- trunk/addons/chan_mobile.c (original)
+++ trunk/addons/chan_mobile.c Sat Jan 14 09:51:43 2012
@@ -2273,14 +2273,13 @@
  */
 static char *hfp_parse_cusd(struct hfp_pvt *hfp, char *buf)
 {
-	int i, state, message_start, message_end;
+	int i, message_start, message_end;
 	char *cusd;
 	size_t s;
 
 	/* parse cusd message in the following format:
 	 * +CUSD: 0,"100,00 EURO, valid till 01.01.2010, you are using tariff "Mega Tariff". More informations *111#."
 	 */
-	state = 0;
 	message_start = 0;
 	message_end = 0;
 	s = strlen(buf);
@@ -2678,7 +2677,7 @@
 {
 	int i, state, group;
 	size_t s;
-	char *indicator = NULL, *values;
+	char *indicator = NULL;
 
 	hfp->nocallsetup = 1;
 
@@ -2717,7 +2716,6 @@
 			}
 			break;
 		case 5: /* mark the start of the value range */
-			values = &buf[i];
 			state++;
 			break;
 		case 6: /* find the end of the value range */
@@ -2989,7 +2987,6 @@
 	sdp_list_t  *l2cap_list = 0, *rfcomm_list = 0, *root_list = 0, *proto_list = 0, *access_proto_list = 0, *svc_uuid_list = 0;
 	sdp_data_t *channel = 0;
 
-	int err = 0;
 	sdp_session_t *session = 0;
 
 	sdp_record_t *record = sdp_record_alloc();
@@ -3026,7 +3023,7 @@
 	if (!(session = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY)))
 		ast_log(LOG_WARNING, "Failed to connect sdp and create session.\n");
 	else
-		err = sdp_record_register(session, record, 0);
+		sdp_record_register(session, record, 0);
 
 	sdp_data_free(channel);
 	sdp_list_free(rfcomm_list, 0);

Modified: trunk/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_h323.c?view=diff&rev=350791&r1=350790&r2=350791
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Sat Jan 14 09:51:43 2012
@@ -3234,6 +3234,7 @@
 	return res;
 }
 
+#if 0
 static char *convertcap(struct ast_format *format)
 {
 	switch (format->id) {
@@ -3260,6 +3261,7 @@
 		return NULL;
 	}
 }
+#endif
 
 static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *rtp, struct ast_rtp_instance *vrtp, struct ast_rtp_instance *trtp, const struct ast_format_cap *codecs, int nat_active)
 {
@@ -3267,13 +3269,18 @@
 	struct oh323_pvt *pvt;
 	struct sockaddr_in them = { 0, };
 	struct sockaddr_in us = { 0, };
+#if 0	/* Native bridge still isn't ready */
 	char *mode;
+#endif
 
 	if (!rtp) {
 		return 0;
 	}
 
+#if 0	/* Native bridge still isn't ready */
 	mode = convertcap(&chan->writeformat);
+#endif
+
 	pvt = (struct oh323_pvt *) chan->tech_pvt;
 	if (!pvt) {
 		ast_log(LOG_ERROR, "No Private Structure, this is bad\n");

Modified: trunk/contrib/scripts/install_prereq
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/install_prereq?view=diff&rev=350791&r1=350790&r2=350791
==============================================================================
--- trunk/contrib/scripts/install_prereq (original)
+++ trunk/contrib/scripts/install_prereq Sat Jan 14 09:51:43 2012
@@ -24,10 +24,10 @@
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libncurses-dev libz-dev libssl-dev libxml2-dev"
 # Asterisk: for addons:
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libcurl-dev libspeex-dev libspeexdsp-dev libogg-dev libvorbis-dev libasound2-dev portaudio19-dev libcurl4-openssl-dev"
-PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpq-dev unixodbc-dev libsqlite0-dev libsqlite3-dev libmysqlclient15-dev libneon27-dev libgmime-2.0-2-dev libusb-dev liblua5.1-0-dev lua5.1"
+PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpq-dev unixodbc-dev libsqlite0-dev libsqlite3-dev libmysqlclient15-dev libneon27-dev libgmime-dev libusb-dev liblua5.1-0-dev lua5.1"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libopenh323-dev libvpb-dev libgtk2.0-dev libmysqlclient-dev libbluetooth-dev libradiusclient-ng-dev freetds-dev"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libopenais-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev libjack-dev"
-PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample-dev libc-client-dev binutils-dev"
+PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample-dev libc-client-dev binutils-dev libsrtp-dev"
 
 PACKAGES_RH="automake gcc gcc-c++ ncurses-devel openssl-devel libxml2-devel unixODBC-devel libcurl-devel libogg-devel libvorbis-devel speex-devel"
 PACKAGES_RH="$PACKAGES_RH spandsp-devel freetds-devel net-snmp-devel iksemel-devel openais-devel newt-devel popt-devel libtool-ltdl-devel lua-devel"

Modified: trunk/res/res_pktccops.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pktccops.c?view=diff&rev=350791&r1=350790&r2=350791
==============================================================================
--- trunk/res/res_pktccops.c (original)
+++ trunk/res/res_pktccops.c Sat Jan 14 09:51:43 2012
@@ -1029,7 +1029,7 @@
 	struct cops_cmts *cmts;
 	struct cops_ippool *new_ippool;
 	const char *host, *cat, *port;
-	int sfd, update;
+	int update;
 	int res = 0;
 	uint16_t t1_temp, t7_temp, t8_temp;
 	uint32_t keepalive_temp;
@@ -1063,7 +1063,6 @@
 			/* Defaults */
 			host = NULL;
 			port = NULL;
-			sfd = 0;
 			t1_temp = t1;
 			t7_temp = t7;
 			t8_temp = t8;
@@ -1333,7 +1332,6 @@
 	unsigned int an,bn,cn,dn;
 	uint32_t mta, ssip;
 	struct cops_cmts *cmts;
-	struct cops_gate *gate;
 
 	switch (cmd) {
 	case CLI_INIT:
@@ -1380,7 +1378,7 @@
 	}
 	ssip = an << 24 | bn << 16 | cn << 8 | dn;
 
-	gate = cops_gate_cmd(GATE_SET, cmts, trid, mta, atoi(a->argv[4]), atof(a->argv[5]), atoi(a->argv[6]), ssip, atoi(a->argv[8]), NULL);
+	cops_gate_cmd(GATE_SET, cmts, trid, mta, atoi(a->argv[4]), atof(a->argv[5]), atoi(a->argv[6]), ssip, atoi(a->argv[8]), NULL);
 	return CLI_SUCCESS;
 }
 




More information about the asterisk-commits mailing list