diff options
| -rw-r--r-- | addons/chan_mobile.c | 9 | ||||
| -rw-r--r-- | channels/chan_h323.c | 7 | ||||
| -rwxr-xr-x | contrib/scripts/install_prereq | 4 | ||||
| -rw-r--r-- | res/res_pktccops.c | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c index defbe19a3..b99b2d7f7 100644 --- a/addons/chan_mobile.c +++ b/addons/chan_mobile.c @@ -2273,14 +2273,13 @@ static int hfp_parse_cmgr(struct hfp_pvt *hfp, char *buf, char **from_number, ch */ 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 @@ static int hfp_parse_cind_test(struct hfp_pvt *hfp, char *buf) { int i, state, group; size_t s; - char *indicator = NULL, *values; + char *indicator = NULL; hfp->nocallsetup = 1; @@ -2717,7 +2716,6 @@ static int hfp_parse_cind_test(struct hfp_pvt *hfp, char *buf) } 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 @@ static sdp_session_t *sdp_register(void) 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 @@ static sdp_session_t *sdp_register(void) 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); diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 7999bc40a..80970a9ea 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -3234,6 +3234,7 @@ static enum ast_rtp_glue_result oh323_get_rtp_peer(struct ast_channel *chan, str return res; } +#if 0 static char *convertcap(struct ast_format *format) { switch (format->id) { @@ -3260,6 +3261,7 @@ static char *convertcap(struct ast_format *format) 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 @@ static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance 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"); diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq index b9345ed5d..06eb9faef 100755 --- a/contrib/scripts/install_prereq +++ b/contrib/scripts/install_prereq @@ -24,10 +24,10 @@ PACKAGES_DEBIAN="build-essential" 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" diff --git a/res/res_pktccops.c b/res/res_pktccops.c index 0572658ac..e3e162587 100644 --- a/res/res_pktccops.c +++ b/res/res_pktccops.c @@ -1029,7 +1029,7 @@ static int load_pktccops_config(void) 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 @@ static int load_pktccops_config(void) /* Defaults */ host = NULL; port = NULL; - sfd = 0; t1_temp = t1; t7_temp = t7; t8_temp = t8; @@ -1333,7 +1332,6 @@ static char *pktccops_gateset(struct ast_cli_entry *e, int cmd, struct ast_cli_a 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 @@ static char *pktccops_gateset(struct ast_cli_entry *e, int cmd, struct ast_cli_a } 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; } |