[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r350936 - in /team/irroot/dist...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jan 16 05:33:42 CST 2012
Author: irroot
Date: Mon Jan 16 05:33:33 2012
New Revision: 350936
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=350936
Log:
Multiple revisions 350552,350555,350571,350679,350730,350733,350736,350788-350789,350837,350885,350888
........
r350552 | mjordan | 2012-01-13 18:57:33 +0200 (Fri, 13 Jan 2012) | 16 lines
Realtime queues failed to load queue information without queue member table
Previously, realtime queues could be loaded without defining the queue member
table. This allowed for queue members to be dynamic, while the realtime
queue definitions could exist in some backing storage. Revision 342223 broke
this when it changed the return value for realtime_multientry to return NULL
when no results are returned. Previously, an empty ast_config object was
expected.
(closes issue ASTERISK-19170)
Reported by: Rene Mendoza
Tested by: Rene Mendoza
Patches:
rt_queue_member_patch.diff uploaded by Matt Jordan (license 6283)
........
r350555 | rmudgett | 2012-01-13 19:12:51 +0200 (Fri, 13 Jan 2012) | 12 lines
Add missing CEL logging fields to various CEL backends.
* Add missing eventextra to cel_psql.c and cel_odbc.c.
* Add missing PeerAccount and EventExtra to cel_manager.c.
* Add missing userdeftype support for cel_custom.conf.sample and
cel_sqlite3_custom.conf.sample.
(closes issue ASTERISK-17190)
Reported by: Bryant Zimmerman
........
r350571 | rmudgett | 2012-01-13 19:23:57 +0200 (Fri, 13 Jan 2012) | 8 lines
Use compatible names for event extra data for various CEL backends.
* Change eventextra to extra in cel_psql.c and cel_odbc.c.
* Change EventExtra to Extra in cel_manager.c.
(issue ASTERISK-17190)
........
r350679 | mmichelson | 2012-01-13 22:29:03 +0200 (Fri, 13 Jan 2012) | 3 lines
Set port to a default sane value if a bogus one is provided when parsing hostnames.
........
r350730 | kmoore | 2012-01-13 23:40:32 +0200 (Fri, 13 Jan 2012) | 11 lines
Make sure asterisk builds on OpenBSD
OpenBSD defines SO_PEERCRED, but it returns a 'struct sockpeercred', not
'struct ucred', which causes compilation of main/asterisk.c to fail in
read_credentials(). This allows configure to check for sockpeercred and
asterisk to deal with it properly.
(closes issue ASTERISK-18929)
Reported-by: Barry Miller
Patch-by: Barry Miller
........
r350733 | rmudgett | 2012-01-13 23:51:03 +0200 (Fri, 13 Jan 2012) | 1 line
Correct eventtype names in cel_odbc and cel_pgsql sample files
........
r350736 | kmoore | 2012-01-14 00:05:07 +0200 (Sat, 14 Jan 2012) | 4 lines
Run bootstrap.sh for the for the ASTERISK-18929 fix
configure and autoconfig.h.in were not regenerated when the fix was committed.
........
r350788 | kpfleming | 2012-01-14 17:22:33 +0200 (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 17:23:32 +0200 (Sat, 14 Jan 2012) | 3 lines
Correct some 'set-but-not-used' variable warnings.
........
r350837 | kpfleming | 2012-01-14 18:40:17 +0200 (Sat, 14 Jan 2012) | 7 lines
Ensure that all AC_LANG_PROGRAM calls in the configure script are properly quoted.
Recent versions of autoconf (2.68 on my system) won't properly process the configure
script unless every call to AC_LANG_PROGRAM is m4-quoted. Many calls in the script
were, but many were not. This patch corrects the unquoted calls.
........
r350885 | wdoekes | 2012-01-15 21:47:07 +0200 (Sun, 15 Jan 2012) | 7 lines
Fix -Werror=unused-but-set-variable compile error in utils/extconf.c.
Note that I'm not confirming legitimacy of having that file in tree at
all. Is anyone using aelparse/conf2ael?
(issue ASTERISK-15350)
........
r350888 | wdoekes | 2012-01-15 22:07:13 +0200 (Sun, 15 Jan 2012) | 12 lines
Allow only one thread at a time to do asterisk cleanup/shutdown.
Add locking around the really-really-quit part of the core stop/restart
part. Previously more than one thread could be called to do cleanup,
causing atexit handlers to be run multiple times, in turn causing
segfaults.
(issue ASTERISK-18883)
Reviewed by: Terry Wilson
Review: https://reviewboard.asterisk.org/r/1662/
Review: https://reviewboard.asterisk.org/r/1658/
........
Merged revisions 350552,350555,350571,350679,350730,350733,350736,350788-350789,350837,350885,350888 from http://svn.asterisk.org/svn/asterisk/branches/1.8
Modified:
team/irroot/distrotech-customers-1.8/ (props changed)
team/irroot/distrotech-customers-1.8/addons/chan_mobile.c
team/irroot/distrotech-customers-1.8/autoconf/ast_gcc_attribute.m4
team/irroot/distrotech-customers-1.8/autoconf/libcurl.m4
team/irroot/distrotech-customers-1.8/bootstrap.sh
team/irroot/distrotech-customers-1.8/cel/cel_manager.c
team/irroot/distrotech-customers-1.8/cel/cel_odbc.c
team/irroot/distrotech-customers-1.8/cel/cel_pgsql.c
team/irroot/distrotech-customers-1.8/channels/chan_h323.c
team/irroot/distrotech-customers-1.8/channels/sip/config_parser.c
team/irroot/distrotech-customers-1.8/configs/cel.conf.sample
team/irroot/distrotech-customers-1.8/configs/cel_custom.conf.sample
team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample
team/irroot/distrotech-customers-1.8/configs/cel_pgsql.conf.sample
team/irroot/distrotech-customers-1.8/configs/cel_sqlite3_custom.conf.sample
team/irroot/distrotech-customers-1.8/configure
team/irroot/distrotech-customers-1.8/configure.ac
team/irroot/distrotech-customers-1.8/contrib/scripts/install_prereq
team/irroot/distrotech-customers-1.8/include/asterisk/autoconfig.h.in
team/irroot/distrotech-customers-1.8/main/asterisk.c
team/irroot/distrotech-customers-1.8/main/cel.c
team/irroot/distrotech-customers-1.8/utils/extconf.c
Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
automerge = *
Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 16 05:33:33 2012
@@ -1,1 +1,1 @@
-/branches/1.8:1-350511
+/branches/1.8:1-350935
Modified: team/irroot/distrotech-customers-1.8/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/addons/chan_mobile.c?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/addons/chan_mobile.c (original)
+++ team/irroot/distrotech-customers-1.8/addons/chan_mobile.c Mon Jan 16 05:33:33 2012
@@ -2276,14 +2276,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);
@@ -2681,7 +2680,7 @@
{
int i, state, group;
size_t s;
- char *indicator = NULL, *values;
+ char *indicator = NULL;
hfp->nocallsetup = 1;
@@ -2720,7 +2719,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 */
@@ -2992,7 +2990,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();
@@ -3029,7 +3026,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: team/irroot/distrotech-customers-1.8/autoconf/ast_gcc_attribute.m4
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/autoconf/ast_gcc_attribute.m4?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/autoconf/ast_gcc_attribute.m4 (original)
+++ team/irroot/distrotech-customers-1.8/autoconf/ast_gcc_attribute.m4 Mon Jan 16 05:33:33 2012
@@ -11,8 +11,8 @@
if test "x$2" = "x"
then
AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM([$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}],
- []),
+ [AC_LANG_PROGRAM([$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}],
+ [])],
AC_MSG_RESULT(yes)
m4_ifval([$4],$4=1)
AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
@@ -20,8 +20,8 @@
)
else
AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}],
- []),
+ [AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}],
+ [])],
AC_MSG_RESULT(yes)
m4_ifval([$4],$4=1)
AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
Modified: team/irroot/distrotech-customers-1.8/autoconf/libcurl.m4
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/autoconf/libcurl.m4?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/autoconf/libcurl.m4 (original)
+++ team/irroot/distrotech-customers-1.8/autoconf/libcurl.m4 Mon Jan 16 05:33:33 2012
@@ -143,7 +143,7 @@
_libcurl_save_libs=$LIBS
LIBS="$CURL_LIB $LIBS"
- AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curl/curl.h>],[
/* Try and use a few common options to force a failure if we are
missing symbols or can't link. */
int x;
@@ -154,7 +154,7 @@
x=CURLOPT_ERRORBUFFER;
x=CURLOPT_STDERR;
x=CURLOPT_VERBOSE;
-]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
+])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
CPPFLAGS=$_libcurl_save_cppflags
LIBS=$_libcurl_save_libs
Modified: team/irroot/distrotech-customers-1.8/bootstrap.sh
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/bootstrap.sh?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/bootstrap.sh (original)
+++ team/irroot/distrotech-customers-1.8/bootstrap.sh Mon Jan 16 05:33:33 2012
@@ -16,6 +16,10 @@
'FreeBSD 4'*) # FreeBSD 4.x has a different naming
MY_AC_VER=259
MY_AM_VER=19
+ ;;
+ OpenBSD*)
+ export AUTOCONF_VERSION=2.63
+ export AUTOMAKE_VERSION=1.9
;;
*'BSD'*)
MY_AC_VER=-2.62
Modified: team/irroot/distrotech-customers-1.8/cel/cel_manager.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/cel/cel_manager.c?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/cel/cel_manager.c (original)
+++ team/irroot/distrotech-customers-1.8/cel/cel_manager.c Mon Jan 16 05:33:33 2012
@@ -61,11 +61,11 @@
.version = AST_CEL_EVENT_RECORD_VERSION,
};
- if (ast_cel_fill_record(event, &record)) {
+ if (!enablecel) {
return;
}
- if (!enablecel) {
+ if (ast_cel_fill_record(event, &record)) {
return;
}
@@ -90,13 +90,29 @@
"UniqueID: %s\r\n"
"LinkedID: %s\r\n"
"Userfield: %s\r\n"
- "Peer: %s\r\n",
- record.event_name, record.account_code, record.caller_id_num,
- record.caller_id_name, record.caller_id_ani, record.caller_id_rdnis,
- record.caller_id_dnid, record.extension, record.context, record.channel_name,
- record.application_name, record.application_data, start_time,
- ast_cel_get_ama_flag_name(record.amaflag), record.unique_id, record.linked_id,
- record.user_field, record.peer);
+ "Peer: %s\r\n"
+ "PeerAccount: %s\r\n"
+ "Extra: %s\r\n",
+ record.event_name,
+ record.account_code,
+ record.caller_id_num,
+ record.caller_id_name,
+ record.caller_id_ani,
+ record.caller_id_rdnis,
+ record.caller_id_dnid,
+ record.extension,
+ record.context,
+ record.channel_name,
+ record.application_name,
+ record.application_data,
+ start_time,
+ ast_cel_get_ama_flag_name(record.amaflag),
+ record.unique_id,
+ record.linked_id,
+ record.user_field,
+ record.peer,
+ record.peer_account,
+ record.extra);
}
static int load_config(int reload)
Modified: team/irroot/distrotech-customers-1.8/cel/cel_odbc.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/cel/cel_odbc.c (original)
+++ team/irroot/distrotech-customers-1.8/cel/cel_odbc.c Mon Jan 16 05:33:33 2012
@@ -438,6 +438,8 @@
ast_copy_string(colbuf, record.peer, sizeof(colbuf));
} else if (strcmp(entry->celname, "amaflags") == 0) {
snprintf(colbuf, sizeof(colbuf), "%d", record.amaflag);
+ } else if (strcmp(entry->celname, "extra") == 0) {
+ ast_copy_string(colbuf, record.extra, sizeof(colbuf));
} else {
colbuf[0] = 0;
}
Modified: team/irroot/distrotech-customers-1.8/cel/cel_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/cel/cel_pgsql.c?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/cel/cel_pgsql.c (original)
+++ team/irroot/distrotech-customers-1.8/cel/cel_pgsql.c Mon Jan 16 05:33:33 2012
@@ -234,6 +234,8 @@
value = record.user_field;
} else if (strcmp(cur->name, "peer") == 0) {
value = record.peer;
+ } else if (strcmp(cur->name, "extra") == 0) {
+ value = record.extra;
} else {
value = NULL;
}
Modified: team/irroot/distrotech-customers-1.8/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_h323.c?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_h323.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_h323.c Mon Jan 16 05:33:33 2012
@@ -1757,7 +1757,6 @@
}
static struct ast_channel *oh323_request(const char *type, format_t format, const struct ast_channel *requestor, void *data, int *cause)
{
- format_t oldformat;
struct oh323_pvt *pvt;
struct ast_channel *tmpc = NULL;
char *dest = (char *)data;
@@ -1773,7 +1772,6 @@
ast_log(LOG_WARNING, "Unable to build pvt data for '%s'\n", (char *)data);
return NULL;
}
- oldformat = format;
format &= AST_FORMAT_AUDIO_MASK;
if (!format) {
ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n", ast_getformatname_multiple(tmp, sizeof(tmp), format));
@@ -3201,6 +3199,7 @@
return res;
}
+#if 0
static char *convertcap(format_t cap)
{
switch (cap) {
@@ -3227,6 +3226,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, format_t codecs, int nat_active)
{
@@ -3234,13 +3234,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: team/irroot/distrotech-customers-1.8/channels/sip/config_parser.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/sip/config_parser.c?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/sip/config_parser.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/sip/config_parser.c Mon Jan 16 05:33:33 2012
@@ -672,7 +672,9 @@
ast_log(LOG_NOTICE, "'%s' is not a valid port number on line %d of sip.conf. using default.\n", port, lineno);
port = NULL;
}
- } else {
+ }
+
+ if (!port) {
if (*transport & SIP_TRANSPORT_TLS) {
*portnum = STANDARD_TLS_PORT;
} else {
Modified: team/irroot/distrotech-customers-1.8/configs/cel.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/configs/cel.conf.sample?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/configs/cel.conf.sample (original)
+++ team/irroot/distrotech-customers-1.8/configs/cel.conf.sample Mon Jan 16 05:33:33 2012
@@ -56,13 +56,17 @@
; PARK_END -- Unpark event
; BRIDGE_START -- The time a bridge is started
; BRIDGE_END -- The time a bridge is ended
-; 3WAY_START -- When a 3-way conference starts (usually via attended xfer)
+; BRIDGE_UPDATE -- This is a replacement channel (Masquerade)
+; 3WAY_START -- When a 3-way conference starts (usually via attended transfer)
; 3WAY_END -- When one or all exit a 3-way conference
; BLINDTRANSFER -- When a blind transfer is initiated
; ATTENDEDTRANSFER -- When an attended transfer is initiated
; TRANSFER -- Generic transfer initiated; not used yet...?
+; PICKUP -- This channel picked up the peer channel
+; FORWARD -- This channel is being forwarded somewhere else
; HOOKFLASH -- So far, when a hookflash event occurs on a DAHDI
; interface
+; LINKEDID_END -- The last channel with the given linkedid is retired
; USER_DEFINED -- Triggered from the dialplan, and has a name given by the
; user
;
Modified: team/irroot/distrotech-customers-1.8/configs/cel_custom.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/configs/cel_custom.conf.sample?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/configs/cel_custom.conf.sample (original)
+++ team/irroot/distrotech-customers-1.8/configs/cel_custom.conf.sample Mon Jan 16 05:33:33 2012
@@ -22,10 +22,13 @@
; details from the CEL event. There are also a few variables created by this
; module that can be used in a mapping:
;
-; eventtype - The name of the CEL event.
-; eventtime - The timestamp of the CEL event.
-; eventextra - Extra data included with this CEL event, typically along with
-; an event of type USER_DEFINED from CELGenUserEvent().
+; eventtype - The name of the CEL event.
+; eventtime - The timestamp of the CEL event.
+; userdeftype - User defined event type name from CELGenUserEvent().
+; eventextra - Extra data included with this CEL event, typically along with
+; an event of type USER_DEFINED from CELGenUserEvent().
+; BRIDGEPEER - Bridged peer channel name at the time of the CEL event.
+; CHANNEL(peer) could also be used.
;
[mappings]
-;Master.csv => ${CSV_QUOTE(${eventtype})},${CSV_QUOTE(${eventtime})},${CSV_QUOTE(${CALLERID(name)})},${CSV_QUOTE(${CALLERID(num)})},${CSV_QUOTE(${CALLERID(ANI)})},${CSV_QUOTE(${CALLERID(RDNIS)})},${CSV_QUOTE(${CALLERID(DNID)})},${CSV_QUOTE(${CHANNEL(exten)})},${CSV_QUOTE(${CHANNEL(context)})},${CSV_QUOTE(${CHANNEL(channame)})},${CSV_QUOTE(${CHANNEL(appname)})},${CSV_QUOTE(${CHANNEL(appdata)})},${CSV_QUOTE(${CHANNEL(amaflags)})},${CSV_QUOTE(${CHANNEL(accountcode)})},${CSV_QUOTE(${CHANNEL(uniqueid)})},${CSV_QUOTE(${CHANNEL(linkedid)})},${CSV_QUOTE(${CHANNEL(peer)})},${CSV_QUOTE(${CHANNEL(userfield)})},${CSV_QUOTE(${eventextra})}
+;Master.csv => ${CSV_QUOTE(${eventtype})},${CSV_QUOTE(${eventtime})},${CSV_QUOTE(${CALLERID(name)})},${CSV_QUOTE(${CALLERID(num)})},${CSV_QUOTE(${CALLERID(ANI)})},${CSV_QUOTE(${CALLERID(RDNIS)})},${CSV_QUOTE(${CALLERID(DNID)})},${CSV_QUOTE(${CHANNEL(exten)})},${CSV_QUOTE(${CHANNEL(context)})},${CSV_QUOTE(${CHANNEL(channame)})},${CSV_QUOTE(${CHANNEL(appname)})},${CSV_QUOTE(${CHANNEL(appdata)})},${CSV_QUOTE(${CHANNEL(amaflags)})},${CSV_QUOTE(${CHANNEL(accountcode)})},${CSV_QUOTE(${CHANNEL(uniqueid)})},${CSV_QUOTE(${CHANNEL(linkedid)})},${CSV_QUOTE(${BRIDGEPEER})},${CSV_QUOTE(${CHANNEL(userfield)})},${CSV_QUOTE(${userdeftype})},${CSV_QUOTE(${eventextra})}
Modified: team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample (original)
+++ team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample Mon Jan 16 05:33:33 2012
@@ -19,32 +19,32 @@
; table names, you will get duplicate records in that table. So be careful.
;
; CEL FIELDS:
-; eventtype
-; CEL_CHANNEL_START = 1
-; CEL_CHANNEL_END = 2
-; CEL_HANGUP = 3
-; CEL_ANSWER = 4
-; CEL_APP_START = 5
-; CEL_APP_END = 6
-; CEL_BRIDGE_START = 7
-; CEL_BRIDGE_END = 8
-; CEL_CONF_START = 9
-; CEL_CONF_END = 10
-; CEL_PARK_START = 11
-; CEL_PARK_END = 12
-; CEL_BLINDTRANSFER = 13
-; CEL_ATTENDEDTRANSFER = 14
-; CEL_TRANSFER = 15
-; CEL_HOOKFLASH = 16
-; CEL_3WAY_START = 17
-; CEL_3WAY_END = 18
-; CEL_CONF_ENTER = 19
-; CEL_CONF_EXIT = 20
-; CEL_USER_DEFINED = 21
-; CEL_LINKEDID_END = 22
-; CEL_BRIDGE_UPDATE = 23
-; CEL_PICKUP = 24
-; CEL_FORWARD = 25
+; eventtype
+; CHANNEL_START = 1
+; CHANNEL_END = 2
+; HANGUP = 3
+; ANSWER = 4
+; APP_START = 5
+; APP_END = 6
+; BRIDGE_START = 7
+; BRIDGE_END = 8
+; CONF_START = 9
+; CONF_END = 10
+; PARK_START = 11
+; PARK_END = 12
+; BLINDTRANSFER = 13
+; ATTENDEDTRANSFER = 14
+; TRANSFER = 15
+; HOOKFLASH = 16
+; 3WAY_START = 17
+; 3WAY_END = 18
+; CONF_ENTER = 19
+; CONF_EXIT = 20
+; USER_DEFINED = 21
+; LINKEDID_END = 22
+; BRIDGE_UPDATE = 23
+; PICKUP = 24
+; FORWARD = 25
; eventtime (timeval, includes microseconds)
; userdeftype (set only if eventtype == USER_DEFINED)
; cid_name
@@ -64,6 +64,7 @@
; amaflags (an int)
; userfield
; peer
+; extra
; The point of this module is to allow you log whatever you like in terms of the
; CEL variables. Do you want to log uniqueid? Then simply ensure that your
Modified: team/irroot/distrotech-customers-1.8/configs/cel_pgsql.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/configs/cel_pgsql.conf.sample?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/configs/cel_pgsql.conf.sample (original)
+++ team/irroot/distrotech-customers-1.8/configs/cel_pgsql.conf.sample Mon Jan 16 05:33:33 2012
@@ -6,32 +6,32 @@
;
; CEL field names:
;
-; eventtype
-; CEL_CHANNEL_START = 1
-; CEL_CHANNEL_END = 2
-; CEL_HANGUP = 3
-; CEL_ANSWER = 4
-; CEL_APP_START = 5
-; CEL_APP_END = 6
-; CEL_BRIDGE_START = 7
-; CEL_BRIDGE_END = 8
-; CEL_CONF_START = 9
-; CEL_CONF_END = 10
-; CEL_PARK_START = 11
-; CEL_PARK_END = 12
-; CEL_BLINDTRANSFER = 13
-; CEL_ATTENDEDTRANSFER = 14
-; CEL_TRANSFER = 15
-; CEL_HOOKFLASH = 16
-; CEL_3WAY_START = 17
-; CEL_3WAY_END = 18
-; CEL_CONF_ENTER = 19
-; CEL_CONF_EXIT = 20
-; CEL_USER_DEFINED = 21
-; CEL_LINKEDID_END = 22
-; CEL_BRIDGE_UPDATE = 23
-; CEL_PICKUP = 24
-; CEL_FORWARD = 25
+; eventtype
+; CHANNEL_START = 1
+; CHANNEL_END = 2
+; HANGUP = 3
+; ANSWER = 4
+; APP_START = 5
+; APP_END = 6
+; BRIDGE_START = 7
+; BRIDGE_END = 8
+; CONF_START = 9
+; CONF_END = 10
+; PARK_START = 11
+; PARK_END = 12
+; BLINDTRANSFER = 13
+; ATTENDEDTRANSFER = 14
+; TRANSFER = 15
+; HOOKFLASH = 16
+; 3WAY_START = 17
+; 3WAY_END = 18
+; CONF_ENTER = 19
+; CONF_EXIT = 20
+; USER_DEFINED = 21
+; LINKEDID_END = 22
+; BRIDGE_UPDATE = 23
+; PICKUP = 24
+; FORWARD = 25
; eventtime (timeval, includes microseconds)
; userdeftype (set only if eventtype == USER_DEFINED)
; cid_name
@@ -48,10 +48,10 @@
; peeraccount
; uniqueid
; linkedid
-; amaflag (an int)
+; amaflags (an int)
; userfield
; peer
-
+; extra
[global]
;hostname=localhost
Modified: team/irroot/distrotech-customers-1.8/configs/cel_sqlite3_custom.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/configs/cel_sqlite3_custom.conf.sample?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/configs/cel_sqlite3_custom.conf.sample (original)
+++ team/irroot/distrotech-customers-1.8/configs/cel_sqlite3_custom.conf.sample Mon Jan 16 05:33:33 2012
@@ -5,7 +5,19 @@
;
; Mappings for sqlite3 config file
;
+; Within a mapping, use the CALLERID() and CHANNEL() functions to retrieve
+; details from the CEL event. There are also a few variables created by this
+; module that can be used in a mapping:
+;
+; eventtype - The name of the CEL event.
+; eventtime - The timestamp of the CEL event.
+; userdeftype - User defined event type name from CELGenUserEvent().
+; eventextra - Extra data included with this CEL event, typically along with
+; an event of type USER_DEFINED from CELGenUserEvent().
+; BRIDGEPEER - Bridged peer channel name at the time of the CEL event.
+; CHANNEL(peer) could also be used.
+;
;[master] ; currently, only file "master.db" is supported, with only one table at a time.
;table => cel
-;columns => eventtype, eventtime, cidname, cidnum, cidani, cidrdnis, ciddnid, context, exten, channame, appname, appdata, amaflags, accountcode, uniqueid, userfield, peer
-;values => '${eventtype}','${eventtime}','${CALLERID(name)}','${CALLERID(num)}','${CALLERID(ANI)}','${CALLERID(RDNIS)}','${CALLERID(DNID)}','${CHANNEL(context)}','${CHANNEL(exten)}','${CHANNEL(channame)}','${CHANNEL(appname)}','${CHANNEL(appdata)}','${CHANNEL(amaflags)}','${CHANNEL(accountcode)}','${CHANNEL(uniqueid)}','${CHANNEL(userfield)}','${CHANNEL(peer)}'
+;columns => eventtype, eventtime, cidname, cidnum, cidani, cidrdnis, ciddnid, context, exten, channame, appname, appdata, amaflags, accountcode, uniqueid, userfield, peer, userdeftype, eventextra
+;values => '${eventtype}','${eventtime}','${CALLERID(name)}','${CALLERID(num)}','${CALLERID(ANI)}','${CALLERID(RDNIS)}','${CALLERID(DNID)}','${CHANNEL(context)}','${CHANNEL(exten)}','${CHANNEL(channame)}','${CHANNEL(appname)}','${CHANNEL(appdata)}','${CHANNEL(amaflags)}','${CHANNEL(accountcode)}','${CHANNEL(uniqueid)}','${CHANNEL(userfield)}','${BRIDGEPEER}','${userdeftype}','${eventextra}'
Modified: team/irroot/distrotech-customers-1.8/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/configure.ac?view=diff&rev=350936&r1=350935&r2=350936
==============================================================================
--- team/irroot/distrotech-customers-1.8/configure.ac (original)
+++ team/irroot/distrotech-customers-1.8/configure.ac Mon Jan 16 05:33:33 2012
@@ -531,7 +531,8 @@
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_CHECK_MEMBERS([struct stat.st_blksize])
-AC_CHECK_MEMBERS([struct ucred.uid, struct ucred.cr_uid], [], [], [#include <sys/socket.h>])
+AC_CHECK_MEMBERS([struct ucred.uid, struct ucred.cr_uid, struct sockpeercred.uid], [], [], [#include <sys/types.h>
+#include <sys/socket.h> ])
AC_CHECK_MEMBERS([struct ifreq.ifr_ifru.ifru_hwaddr], [], [], [#include <net/if.h>])
AC_HEADER_TIME
AC_STRUCT_TM
@@ -577,8 +578,8 @@
AC_MSG_CHECKING(for LLONG_MAX in limits.h)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([#include <limits.h>],
- [long long foo = LLONG_MAX]),
+ [AC_LANG_PROGRAM([#include <limits.h>],
+ [long long foo = LLONG_MAX])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_LLONG_MAX], 1, [Define to 1 if limits.h includes a LLONG_MAX definition.]),
AC_MSG_RESULT(no)
@@ -586,8 +587,8 @@
AC_MSG_CHECKING(for timersub in time.h)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([#include <sys/time.h>],
- [struct timeval *a; timersub(a, a, a);]),
+ [AC_LANG_PROGRAM([#include <sys/time.h>],
+ [struct timeval *a; timersub(a, a, a);])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_TIMERSUB], 1, [Define to 1 if your system defines timersub.]),
AC_MSG_RESULT(no)
@@ -603,7 +604,7 @@
LDFLAGS="${LDFLAGS} -Wl,--dynamic-list,conftest.dynamics"
PBX_DYNAMIC_LIST=0
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([], []),
+ [AC_LANG_PROGRAM([], [])],
PBX_DYNAMIC_LIST=1
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
@@ -638,8 +639,8 @@
# check if we have IP_PKTINFO constant defined
AC_MSG_CHECKING(for IP_PKTINFO)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([#include <netinet/in.h>],
- [int pi = IP_PKTINFO;]),
+ [AC_LANG_PROGRAM([#include <netinet/in.h>],
+ [int pi = IP_PKTINFO;])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_PKTINFO], 1, [Define to 1 if your system defines IP_PKTINFO.]),
AC_MSG_RESULT(no)
@@ -650,9 +651,9 @@
AC_MSG_CHECKING(for gethostbyname_r with 6 arguments)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([#include <stdlib.h>
+ [AC_LANG_PROGRAM([#include <stdlib.h>
#include <netdb.h>],
- [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);]),
+ [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_GETHOSTBYNAME_R_6], 1, [Define to 1 if your system has gethostbyname_r with 6 arguments.]),
AC_MSG_RESULT(no)
@@ -660,9 +661,9 @@
AC_MSG_CHECKING(for gethostbyname_r with 5 arguments)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([#include <stdlib.h>
+ [AC_LANG_PROGRAM([#include <stdlib.h>
#include <netdb.h>],
- [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);]),
+ [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_GETHOSTBYNAME_R_5], 1, [Define to 1 if your system has gethostbyname_r with 5 arguments.]),
AC_MSG_RESULT(no)
@@ -672,7 +673,7 @@
AC_MSG_CHECKING(for __swap16 variant of <sys/endian.h> byteswapping macros)
AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <sys/endian.h>], [int a = 1; int b = __swap16(a);]),
+[AC_LANG_PROGRAM([#include <sys/endian.h>], [int a = 1; int b = __swap16(a);])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_SYS_ENDIAN_SWAP16], 1, [Define to 1 if your sys/endian.h header file provides the __swap16 macro.]),
AC_MSG_RESULT(no)
@@ -680,7 +681,7 @@
AC_MSG_CHECKING(for bswap16 variant of <sys/endian.h> byteswapping macros)
AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <sys/endian.h>], [int a = 1; int b = bswap16(a);]),
+[AC_LANG_PROGRAM([#include <sys/endian.h>], [int a = 1; int b = bswap16(a);])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_SYS_ENDIAN_BSWAP16], 1, [Define to 1 if your sys/endian.h header file provides the bswap16 macro.]),
AC_MSG_RESULT(no)
@@ -693,13 +694,13 @@
AC_MSG_CHECKING(for locale_t in locale.h)
AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <locale.h>], [locale_t lt = NULL]),
+[AC_LANG_PROGRAM([#include <locale.h>], [locale_t lt = NULL])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_LOCALE_T_IN_LOCALE_H], 1, [Define to 1 if your system defines the locale_t type in locale.h]),
AC_MSG_RESULT(no)
AC_MSG_CHECKING(for locale_t in xlocale.h)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([#include <xlocale.h>], [locale_t lt = NULL]),
+ [AC_LANG_PROGRAM([#include <xlocale.h>], [locale_t lt = NULL])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_LOCALE_T_IN_XLOCALE_H], 1, [Define to 1 if your system defines the locale_t type in xlocale.h]),
AC_MSG_RESULT(no)
@@ -708,7 +709,7 @@
AC_MSG_CHECKING(for O_EVTONLY in fcntl.h)
AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <fcntl.h>], [int a = O_EVTONLY;]),
+[AC_LANG_PROGRAM([#include <fcntl.h>], [int a = O_EVTONLY;])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_O_EVTONLY], 1, [Define to 1 if your system defines the file flag O_EVTONLY in fcntl.h]),
AC_MSG_RESULT(no)
@@ -716,7 +717,7 @@
AC_MSG_CHECKING(for O_SYMLINK in fcntl.h)
AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <fcntl.h>], [int a = O_SYMLINK;]),
+[AC_LANG_PROGRAM([#include <fcntl.h>], [int a = O_SYMLINK;])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_O_SYMLINK], 1, [Define to 1 if your system defines the file flag O_SYMLINK in fcntl.h]),
AC_MSG_RESULT(no)
@@ -726,7 +727,7 @@
AC_MSG_CHECKING(for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h)
AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_RWLOCK_PREFER_WRITER_NP;]),
+[AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_RWLOCK_PREFER_WRITER_NP;])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP], 1, [Define to 1 if your system defines PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h]),
AC_MSG_RESULT(no)
@@ -734,7 +735,7 @@
AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h)
AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_MUTEX_RECURSIVE_NP;]),
+[AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_MUTEX_RECURSIVE_NP;])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE_NP], 1, [Define to 1 if your system defines PTHREAD_MUTEX_RECURSIVE_NP in pthread.h]),
AC_MSG_RESULT(no)
@@ -791,11 +792,11 @@
# Generally yes on OpenBSD/FreeBSD and no on Mac OS X.
AC_MSG_CHECKING(whether we can compare a mutex to its initial value)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([#include <pthread.h>], [pthread_mutex_t lock;
+ [AC_LANG_PROGRAM([#include <pthread.h>], [pthread_mutex_t lock;
if ((lock) != ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
return 0;
}
- return 0]),
+ return 0])],
AC_MSG_RESULT(yes)
AC_DEFINE([CAN_COMPARE_MUTEX_TO_INIT_VALUE], 1, [Define to 1 if your system's implementation of mutexes supports comparison of a mutex to its initializer.]),
AC_MSG_RESULT(no)
@@ -818,7 +819,7 @@
AC_MSG_CHECKING(for compiler atomic operations)
AC_LINK_IFELSE(
-AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);]),
+[AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_GCC_ATOMICS], 1, [Define to 1 if your GCC C compiler provides atomic operations.]),
AC_MSG_RESULT(no)
@@ -827,8 +828,8 @@
# glibc, AFAIK, is the only C library that makes printing a NULL to a string safe.
AC_MSG_CHECKING([if your system printf is NULL-safe.])
AC_RUN_IFELSE(
- AC_LANG_PROGRAM([#include <stdio.h>],
- [printf("%s", NULL)]),
+ [AC_LANG_PROGRAM([#include <stdio.h>],
+ [printf("%s", NULL)])],
AC_DEFINE([HAVE_NULLSAFE_PRINTF], 1, [Define to 1 if your C library can safely print NULL to string formats.])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no),
@@ -838,7 +839,7 @@
AC_MSG_CHECKING(if we can increase the maximum select-able file descriptor)
AC_RUN_IFELSE(
-AC_LANG_PROGRAM([
+[AC_LANG_PROGRAM([
#include <stdio.h>
#include <sys/select.h>
#include <sys/time.h>
@@ -861,7 +862,7 @@
FD_SET(fd0, (fd_set *) &fds);
FD_SET(fd1, (fd_set *) &fds);
if (select(FD_SETSIZE + 2, (fd_set *) &fds, NULL, NULL, &tv) < 0) { exit(1); }
- exit(0)]]),
+ exit(0)]])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_VARIABLE_FDSET], 1, [Define to 1 if your system can support larger than default select bitmasks.]),
AC_MSG_RESULT(no),
@@ -870,11 +871,11 @@
if test "${ac_cv_have_variable_fdset}x" = "0x"; then
AC_RUN_IFELSE(
- AC_LANG_PROGRAM([
+ [AC_LANG_PROGRAM([
#include <unistd.h>
#include <sys/types.h>
#include <stdlib.h>
-], [if (getuid() != 0) { exit(1); }]),
+], [if (getuid() != 0) { exit(1); }])],
AC_DEFINE([CONFIGURE_RAN_AS_ROOT], 1, [Some configure tests will unexpectedly fail if configure is run by a non-root user. These may be able to be tested at runtime.]))
fi
@@ -922,13 +923,13 @@
saved_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} -ffunction-sections"
AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM([], [int x = 1;]),
+ [AC_LANG_PROGRAM([], [int x = 1;])],
AC_MSG_RESULT(yes)
[saved_LDFLAGS="${LDFLAGS}"]
[LDFLAGS="${LDFLAGS} -Wl,--gc-sections"]
AC_MSG_CHECKING(for --gc-sections support)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([], [int x = 1;]),
+ [AC_LANG_PROGRAM([], [int x = 1;])],
AC_MSG_RESULT(yes)
[GC_CFLAGS="-ffunction-sections"]
[[GC_LDFLAGS="-Wl,--gc-sections"]],
@@ -983,8 +984,8 @@
AC_MSG_CHECKING(for sysinfo)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([#include <sys/sysinfo.h>],
- [struct sysinfo sys_info; int uptime = sys_info.uptime]),
+ [AC_LANG_PROGRAM([#include <sys/sysinfo.h>],
+ [struct sysinfo sys_info; int uptime = sys_info.uptime])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_SYSINFO], 1, [Define to 1 if your system has sysinfo support]),
AC_MSG_RESULT(no)
@@ -993,7 +994,7 @@
AC_SEARCH_LIBS(res_9_ninit, resolv)
AC_MSG_CHECKING(for res_ninit)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([
+ [AC_LANG_PROGRAM([
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
@@ -1004,13 +1005,13 @@
#include <arpa/nameser.h>
#endif
#include <resolv.h>],
- [int foo = res_ninit(NULL);]),
+ [int foo = res_ninit(NULL);])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.])
AC_SEARCH_LIBS(res_9_ndestroy, resolv)
AC_MSG_CHECKING(for res_ndestroy)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([
+ [AC_LANG_PROGRAM([
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
@@ -1021,7 +1022,7 @@
#include <arpa/nameser.h>
#endif
#include <resolv.h>],
- [res_ndestroy(NULL);]),
+ [res_ndestroy(NULL);])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_RES_NDESTROY], 1, [Define to 1 if your system has the ndestroy resolver function.]),
AC_MSG_RESULT(no)
@@ -1029,7 +1030,7 @@
AC_SEARCH_LIBS(res_9_close, resolv)
AC_MSG_CHECKING(for res_close)
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([
+ [AC_LANG_PROGRAM([
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
@@ -1040,7 +1041,7 @@
#include <arpa/nameser.h>
#endif
#include <resolv.h>],
- [res_close();]),
+ [res_close();])],
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_RES_CLOSE], 1, [Define to 1 if your system has the close resolver function.]),
AC_MSG_RESULT(no)
@@ -1085,10 +1086,10 @@
old_LIBS=${LIBS}
LIBS="${LIBS} -ldl"
AC_LINK_IFELSE(
- AC_LANG_PROGRAM([#define _GNU_SOURCE 1
[... 659 lines stripped ...]
More information about the asterisk-commits
mailing list