[asterisk-commits] russell: branch russell/chan_console r49132 - in
/team/russell/chan_console: ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Jan 1 18:53:25 MST 2007
Author: russell
Date: Mon Jan 1 19:53:24 2007
New Revision: 49132
URL: http://svn.digium.com/view/asterisk?view=rev&rev=49132
Log:
Merged revisions 49080-49082,49089,49092-49095,49097,49100-49101,49103 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r49080 | oej | 2006-12-31 04:31:23 -0500 (Sun, 31 Dec 2006) | 2 lines
Add version number to useragent string - Issue #8700, blanchet - THANKS!
................
r49081 | oej | 2006-12-31 04:34:11 -0500 (Sun, 31 Dec 2006) | 2 lines
Added some docs
................
r49082 | oej | 2006-12-31 04:38:27 -0500 (Sun, 31 Dec 2006) | 3 lines
Update CHANGES, make section about SIP. This might be a good way to handle
other parts of this file too, as it grows.
................
r49089 | file | 2006-12-31 14:15:23 -0500 (Sun, 31 Dec 2006) | 2 lines
count is no longer used in the iaxq structure really so let's just make this a statically declared linked list.
................
r49092 | oej | 2007-01-01 14:20:46 -0500 (Mon, 01 Jan 2007) | 4 lines
- Implement error handling in ast_append_ha
- Use this in chan_sip
- Document ha functions in acl.c
................
r49093 | oej | 2007-01-01 14:48:31 -0500 (Mon, 01 Jan 2007) | 3 lines
- Add error handling to ast_parse_allow_disallow
- Use this in chan_sip configuration parsing
................
r49094 | oej | 2007-01-01 14:52:22 -0500 (Mon, 01 Jan 2007) | 2 lines
Fix manager too.
................
r49095 | oej | 2007-01-01 15:08:47 -0500 (Mon, 01 Jan 2007) | 2 lines
Doxygen documentationification
................
r49097 | oej | 2007-01-01 15:16:33 -0500 (Mon, 01 Jan 2007) | 2 lines
Block cleanup of release branch
................
r49100 | kpfleming | 2007-01-01 17:49:56 -0500 (Mon, 01 Jan 2007) | 15 lines
Merged revisions 49098-49099 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49098 | kpfleming | 2007-01-01 16:08:24 -0600 (Mon, 01 Jan 2007) | 2 lines
revert this change until a better solution can be found... 'env -i' was not being used properly, but even when changed to do so, this process fails during cross-compilation because the menuselect build still sees 'CC' as set to the cross-compiler
........
r49099 | kpfleming | 2007-01-01 16:48:03 -0600 (Mon, 01 Jan 2007) | 2 lines
use a simpler (and portable) method to ensure that menuselect is built as a host binary
........
................
r49101 | kpfleming | 2007-01-01 17:59:01 -0500 (Mon, 01 Jan 2007) | 2 lines
GNU make already knows what the current directory is, there is no need to use 'pwd'
................
r49103 | kpfleming | 2007-01-01 18:43:43 -0500 (Mon, 01 Jan 2007) | 10 lines
Merged revisions 49102 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49102 | kpfleming | 2007-01-01 17:34:35 -0600 (Mon, 01 Jan 2007) | 2 lines
check specifically for VLDTMF and transcoding support in the system's Zaptel installation, and make only the modules that need those features dependent on them (this will allow building the other Zaptel-using parts of Asterisk against older versions of Zaptel or those on other platforms that haven't caught up yet to the Linux version)
........
................
Modified:
team/russell/chan_console/ (props changed)
team/russell/chan_console/CHANGES
team/russell/chan_console/Makefile
team/russell/chan_console/build_tools/menuselect-deps.in
team/russell/chan_console/channels/chan_h323.c
team/russell/chan_console/channels/chan_iax2.c
team/russell/chan_console/channels/chan_mgcp.c
team/russell/chan_console/channels/chan_sip.c
team/russell/chan_console/channels/chan_skinny.c
team/russell/chan_console/channels/chan_zap.c
team/russell/chan_console/codecs/codec_zap.c
team/russell/chan_console/configs/sip.conf.sample
team/russell/chan_console/configure
team/russell/chan_console/configure.ac
team/russell/chan_console/include/asterisk/acl.h
team/russell/chan_console/include/asterisk/autoconfig.h.in
team/russell/chan_console/include/asterisk/frame.h
team/russell/chan_console/include/asterisk/indications.h
team/russell/chan_console/main/acl.c
team/russell/chan_console/main/frame.c
team/russell/chan_console/main/manager.c
team/russell/chan_console/sounds/Makefile
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 1 19:53:24 2007
@@ -1,1 +1,1 @@
-/trunk:1-49076
+/trunk:1-49131
Modified: team/russell/chan_console/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/CHANGES?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/CHANGES (original)
+++ team/russell/chan_console/CHANGES Mon Jan 1 19:53:24 2007
@@ -6,11 +6,6 @@
prompts within the Voicemail application by changing them in voicemail.conf
* enable https support for builtin web server.
See configs/http.conf.sample for details.
- * add a new option, match_auth_username, to sip.conf,
- to improve the matching of incoming requests.
- If set, and the incoming request carries authentication info,
- the username to match in the users list is taken from there
- rather than from the From: field.
* Argument support for Gosub application
* MailboxExists converted to dialplan function
* Ability to set process limits without restarting Asterisk
@@ -65,3 +60,15 @@
what Asterisk should set as the maximum number of open files when it loads.
* Added the jittertargetextra configuration option.
* Added the URI redirect option for the built-in HTTP server
+
+SIP changes
+-----------
+ * The default SIP useragent= identifier now includes the Asterisk version
+ * A new option, match_auth_username in sip.conf changes the matching of incoming requests.
+ If set, and the incoming request carries authentication info,
+ the username to match in the users list is taken from the Digest header
+ rather than from the From: field. This feature is considered experimental.
+ * The "musiconhold" and "musicclass" settings in sip.conf are now removed,
+ since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
+ * The "localmask" setting was removed in version 1.2 and the reminder about it
+ being removed is now also removed.
Modified: team/russell/chan_console/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/Makefile?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/Makefile (original)
+++ team/russell/chan_console/Makefile Mon Jan 1 19:53:24 2007
@@ -73,7 +73,7 @@
# Create OPTIONS variable
OPTIONS=
-ASTTOPDIR:=$(shell pwd)
+ASTTOPDIR:=$(CURDIR)
# Overwite config files on "make samples"
OVERWRITE=y
@@ -679,7 +679,7 @@
- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
- @env -i && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+ @CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
@echo "Generating input for menuselect ..."
Modified: team/russell/chan_console/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/build_tools/menuselect-deps.in?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/build_tools/menuselect-deps.in (original)
+++ team/russell/chan_console/build_tools/menuselect-deps.in Mon Jan 1 19:53:24 2007
@@ -28,8 +28,9 @@
UNIXODBC=@PBX_UNIXODBC@
VORBIS=@PBX_VORBIS@
VPBAPI=@PBX_VPB@
-WIN32=@OSISWIN32@
ZAPTEL=@PBX_ZAPTEL@
+ZAPTEL_VLDTMF=@PBX_ZAPTEL_VLDTMF@
+ZAPTEL_TRANSCODE=@PBX_ZAPTEL_TRANSCODE@
ZLIB=@PBX_ZLIB@
ISDNNET=@PBX_ISDNNET@
MISDN=@PBX_MISDN@
Modified: team/russell/chan_console/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_h323.c?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/channels/chan_h323.c (original)
+++ team/russell/chan_console/channels/chan_h323.c Mon Jan 1 19:53:24 2007
@@ -1425,7 +1425,7 @@
}
} else if (!strcasecmp(v->name, "permit") ||
!strcasecmp(v->name, "deny")) {
- user->ha = ast_append_ha(v->name, v->value, user->ha);
+ user->ha = ast_append_ha(v->name, v->value, user->ha, NULL);
}
}
if (!user->options.dtmfmode)
Modified: team/russell/chan_console/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_iax2.c?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/channels/chan_iax2.c (original)
+++ team/russell/chan_console/channels/chan_iax2.c Mon Jan 1 19:53:24 2007
@@ -629,10 +629,7 @@
int frames_received;
};
-static struct ast_iax2_queue {
- AST_LIST_HEAD(, iax_frame) queue;
- int count;
-} iaxq;
+static AST_LIST_HEAD_STATIC(queue, iax_frame);
static AST_LIST_HEAD_STATIC(users, iax2_user);
@@ -1808,13 +1805,13 @@
ast_queue_hangup(owner);
}
- AST_LIST_LOCK(&iaxq.queue);
- AST_LIST_TRAVERSE(&iaxq.queue, cur, list) {
+ AST_LIST_LOCK(&queue);
+ AST_LIST_TRAVERSE(&queue, cur, list) {
/* Cancel any pending transmissions */
if (cur->callno == pvt->callno)
cur->retries = -1;
}
- AST_LIST_UNLOCK(&iaxq.queue);
+ AST_LIST_UNLOCK(&queue);
if (pvt->reg)
pvt->reg->callno = 0;
@@ -1924,10 +1921,9 @@
/* Do not try again */
if (freeme) {
/* Don't attempt delivery, just remove it from the queue */
- AST_LIST_LOCK(&iaxq.queue);
- AST_LIST_REMOVE(&iaxq.queue, f, list);
- iaxq.count--;
- AST_LIST_UNLOCK(&iaxq.queue);
+ AST_LIST_LOCK(&queue);
+ AST_LIST_REMOVE(&queue, f, list);
+ AST_LIST_UNLOCK(&queue);
f->retrans = -1;
/* Free the IAX frame */
iax2_frame_free(f);
@@ -2126,15 +2122,15 @@
if (argc != 3)
return RESULT_SHOWUSAGE;
- AST_LIST_LOCK(&iaxq.queue);
- AST_LIST_TRAVERSE(&iaxq.queue, cur, list) {
+ AST_LIST_LOCK(&queue);
+ AST_LIST_TRAVERSE(&queue, cur, list) {
if (cur->retries < 0)
dead++;
if (cur->final)
final++;
cnt++;
}
- AST_LIST_UNLOCK(&iaxq.queue);
+ AST_LIST_UNLOCK(&queue);
ast_cli(fd, " IAX Statistics\n");
ast_cli(fd, "---------------------\n");
@@ -2457,10 +2453,9 @@
/* By setting this to 0, the network thread will send it for us, and
queue retransmission if necessary */
fr->sentyet = 0;
- AST_LIST_LOCK(&iaxq.queue);
- AST_LIST_INSERT_TAIL(&iaxq.queue, fr, list);
- iaxq.count++;
- AST_LIST_UNLOCK(&iaxq.queue);
+ AST_LIST_LOCK(&queue);
+ AST_LIST_INSERT_TAIL(&queue, fr, list);
+ AST_LIST_UNLOCK(&queue);
/* Wake up the network and scheduler thread */
pthread_kill(netthreadid, SIGURG);
signal_condition(&sched_lock, &sched_cond);
@@ -5403,15 +5398,15 @@
pvt->lastsent = 0;
pvt->nextpred = 0;
pvt->pingtime = DEFAULT_RETRY_TIME;
- AST_LIST_LOCK(&iaxq.queue);
- AST_LIST_TRAVERSE(&iaxq.queue, cur, list) {
+ AST_LIST_LOCK(&queue);
+ AST_LIST_TRAVERSE(&queue, cur, list) {
/* We must cancel any packets that would have been transmitted
because now we're talking to someone new. It's okay, they
were transmitted to someone that didn't care anyway. */
if (callno == cur->callno)
cur->retries = -1;
}
- AST_LIST_UNLOCK(&iaxq.queue);
+ AST_LIST_UNLOCK(&queue);
return 0;
}
@@ -5926,15 +5921,15 @@
{
struct iax_frame *f;
- AST_LIST_LOCK(&iaxq.queue);
- AST_LIST_TRAVERSE(&iaxq.queue, f, list) {
+ AST_LIST_LOCK(&queue);
+ AST_LIST_TRAVERSE(&queue, f, list) {
/* Send a copy immediately */
if ((f->callno == callno) && iaxs[f->callno] &&
(f->oseqno >= last)) {
send_packet(f);
}
}
- AST_LIST_UNLOCK(&iaxq.queue);
+ AST_LIST_UNLOCK(&queue);
}
static void __iax2_poke_peer_s(void *data)
@@ -6657,8 +6652,8 @@
/* Ack the packet with the given timestamp */
if (option_debug && iaxdebug)
ast_log(LOG_DEBUG, "Cancelling transmission of packet %d\n", x);
- AST_LIST_LOCK(&iaxq.queue);
- AST_LIST_TRAVERSE(&iaxq.queue, cur, list) {
+ AST_LIST_LOCK(&queue);
+ AST_LIST_TRAVERSE(&queue, cur, list) {
/* If it's our call, and our timestamp, mark -1 retries */
if ((fr->callno == cur->callno) && (x == cur->oseqno)) {
cur->retries = -1;
@@ -6670,7 +6665,7 @@
}
}
}
- AST_LIST_UNLOCK(&iaxq.queue);
+ AST_LIST_UNLOCK(&queue);
}
/* Note how much we've received acknowledgement for */
if (iaxs[fr->callno])
@@ -6815,13 +6810,13 @@
case IAX_COMMAND_TXACC:
if (iaxs[fr->callno]->transferring == TRANSFER_BEGIN) {
/* Ack the packet with the given timestamp */
- AST_LIST_LOCK(&iaxq.queue);
- AST_LIST_TRAVERSE(&iaxq.queue, cur, list) {
+ AST_LIST_LOCK(&queue);
+ AST_LIST_TRAVERSE(&queue, cur, list) {
/* Cancel any outstanding txcnt's */
if ((fr->callno == cur->callno) && (cur->transfer))
cur->retries = -1;
}
- AST_LIST_UNLOCK(&iaxq.queue);
+ AST_LIST_UNLOCK(&queue);
memset(&ied1, 0, sizeof(ied1));
iax_ie_append_short(&ied1, IAX_IE_CALLNO, iaxs[fr->callno]->callno);
send_command(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_TXREADY, 0, ied1.buf, ied1.pos, -1);
@@ -8135,10 +8130,10 @@
for(;;) {
/* Go through the queue, sending messages which have not yet been
sent, and scheduling retransmissions if appropriate */
- AST_LIST_LOCK(&iaxq.queue);
+ AST_LIST_LOCK(&queue);
count = 0;
wakeup = -1;
- AST_LIST_TRAVERSE_SAFE_BEGIN(&iaxq.queue, f, list) {
+ AST_LIST_TRAVERSE_SAFE_BEGIN(&queue, f, list) {
if (f->sentyet)
continue;
@@ -8159,8 +8154,7 @@
if (f->retries < 0) {
/* This is not supposed to be retransmitted */
- AST_LIST_REMOVE(&iaxq.queue, f, list);
- iaxq.count--;
+ AST_LIST_REMOVE(&queue, f, list);
/* Free the iax frame */
iax_frame_free(f);
} else {
@@ -8171,7 +8165,7 @@
}
}
AST_LIST_TRAVERSE_SAFE_END
- AST_LIST_UNLOCK(&iaxq.queue);
+ AST_LIST_UNLOCK(&queue);
if (count >= 20 && option_debug)
ast_log(LOG_DEBUG, "chan_iax2: Sent %d queued outbound frames all at once\n", count);
@@ -8456,7 +8450,7 @@
peer_set_srcaddr(peer, v->value);
} else if (!strcasecmp(v->name, "permit") ||
!strcasecmp(v->name, "deny")) {
- peer->ha = ast_append_ha(v->name, v->value, peer->ha);
+ peer->ha = ast_append_ha(v->name, v->value, peer->ha, NULL);
} else if (!strcasecmp(v->name, "mask")) {
maskfound++;
inet_aton(v->value, &peer->mask);
@@ -8616,7 +8610,7 @@
}
} else if (!strcasecmp(v->name, "permit") ||
!strcasecmp(v->name, "deny")) {
- user->ha = ast_append_ha(v->name, v->value, user->ha);
+ user->ha = ast_append_ha(v->name, v->value, user->ha, NULL);
} else if (!strcasecmp(v->name, "setvar")) {
varname = ast_strdupa(v->value);
if (varname && (varval = strchr(varname,'='))) {
@@ -9984,8 +9978,6 @@
AST_LIST_TRAVERSE_SAFE_END
AST_LIST_UNLOCK(&dynamic_list);
- AST_LIST_HEAD_DESTROY(&iaxq.queue);
-
ast_netsock_release(netsock);
for (x=0;x<IAX_MAX_CALLS;x++)
if (iaxs[x])
@@ -10059,8 +10051,6 @@
}
ast_netsock_init(netsock);
-
- AST_LIST_HEAD_INIT(&iaxq.queue);
ast_cli_register_multiple(cli_iax2, sizeof(cli_iax2) / sizeof(struct ast_cli_entry));
Modified: team/russell/chan_console/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_mgcp.c?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/channels/chan_mgcp.c (original)
+++ team/russell/chan_console/channels/chan_mgcp.c Mon Jan 1 19:53:24 2007
@@ -3638,7 +3638,7 @@
}
} else if (!strcasecmp(v->name, "permit") ||
!strcasecmp(v->name, "deny")) {
- gw->ha = ast_append_ha(v->name, v->value, gw->ha);
+ gw->ha = ast_append_ha(v->name, v->value, gw->ha, NULL);
} else if (!strcasecmp(v->name, "port")) {
gw->addr.sin_port = htons(atoi(v->value));
} else if (!strcasecmp(v->name, "context")) {
Modified: team/russell/chan_console/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_sip.c?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/channels/chan_sip.c (original)
+++ team/russell/chan_console/channels/chan_sip.c Mon Jan 1 19:53:24 2007
@@ -141,6 +141,7 @@
#include "asterisk/compiler.h"
#include "asterisk/threadstorage.h"
#include "asterisk/translate.h"
+#include "asterisk/version.h"
#ifndef FALSE
#define FALSE 0
@@ -15764,7 +15765,11 @@
user->chanvars = add_var(v->value, user->chanvars);
} else if (!strcasecmp(v->name, "permit") ||
!strcasecmp(v->name, "deny")) {
- user->ha = ast_append_ha(v->name, v->value, user->ha);
+ int ha_error = 0;
+
+ user->ha = ast_append_ha(v->name, v->value, user->ha, &ha_error);
+ if (ha_error)
+ ast_log(LOG_ERROR, "Bad ACL entry in configuration line %d : %s\n", v->lineno, v->value);
} else if (!strcasecmp(v->name, "allowtransfer")) {
user->allowtransfer = ast_true(v->value) ? TRANSFER_OPENFORALL : TRANSFER_CLOSED;
} else if (!strcasecmp(v->name, "secret")) {
@@ -15801,9 +15806,13 @@
user->amaflags = format;
}
} else if (!strcasecmp(v->name, "allow")) {
- ast_parse_allow_disallow(&user->prefs, &user->capability, v->value, 1);
+ int error = ast_parse_allow_disallow(&user->prefs, &user->capability, v->value, TRUE);
+ if (error)
+ ast_log(LOG_WARNING, "Codec configuration errors found in line %d : %s = %s\n", v->lineno, v->name, v->value);
} else if (!strcasecmp(v->name, "disallow")) {
- ast_parse_allow_disallow(&user->prefs, &user->capability, v->value, 0);
+ int error = ast_parse_allow_disallow(&user->prefs, &user->capability, v->value, FALSE);
+ if (error)
+ ast_log(LOG_WARNING, "Codec configuration errors found in line %d : %s = %s\n", v->lineno, v->name, v->value);
} else if (!strcasecmp(v->name, "autoframing")) {
user->autoframing = ast_true(v->value);
} else if (!strcasecmp(v->name, "callingpres")) {
@@ -16022,7 +16031,11 @@
return NULL;
}
} else if (!strcasecmp(v->name, "permit") || !strcasecmp(v->name, "deny")) {
- peer->ha = ast_append_ha(v->name, v->value, peer->ha);
+ int ha_error = 0;
+
+ peer->ha = ast_append_ha(v->name, v->value, peer->ha, &ha_error);
+ if (ha_error)
+ ast_log(LOG_ERROR, "Bad ACL entry in configuration line %d : %s\n", v->lineno, v->value);
} else if (!strcasecmp(v->name, "port")) {
if (!realtime && ast_test_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC))
peer->defaddr.sin_port = htons(atoi(v->value));
@@ -16070,9 +16083,13 @@
} else if (!strcasecmp(v->name, "pickupgroup")) {
peer->pickupgroup = ast_get_group(v->value);
} else if (!strcasecmp(v->name, "allow")) {
- ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, 1);
+ int error = ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, TRUE);
+ if (error)
+ ast_log(LOG_WARNING, "Codec configuration errors found in line %d : %s = %s\n", v->lineno, v->name, v->value);
} else if (!strcasecmp(v->name, "disallow")) {
- ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, 0);
+ int error = ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, FALSE);
+ if (error)
+ ast_log(LOG_WARNING, "Codec configuration errors found in line %d : %s = %s\n", v->lineno, v->name, v->value);
} else if (!strcasecmp(v->name, "autoframing")) {
peer->autoframing = ast_true(v->value);
} else if (!strcasecmp(v->name, "rtptimeout")) {
@@ -16205,7 +16222,7 @@
global_notifyhold = FALSE; /*!< Keep track of hold status for a peer */
global_alwaysauthreject = 0;
global_allowsubscribe = FALSE;
- ast_copy_string(global_useragent, DEFAULT_USERAGENT, sizeof(global_useragent));
+ snprintf(global_useragent, sizeof(global_useragent), "%s %s", DEFAULT_USERAGENT, ASTERISK_VERSION);
ast_copy_string(default_notifymime, DEFAULT_NOTIFYMIME, sizeof(default_notifymime));
if (ast_strlen_zero(ast_config_AST_SYSTEM_NAME))
ast_copy_string(global_realm, DEFAULT_REALM, sizeof(global_realm));
@@ -16404,10 +16421,14 @@
}
} else if (!strcasecmp(v->name, "localnet")) {
struct ast_ha *na;
- if (!(na = ast_append_ha("d", v->value, localaddr)))
+ int ha_error;
+
+ if (!(na = ast_append_ha("d", v->value, localaddr, &ha_error)))
ast_log(LOG_WARNING, "Invalid localnet value: %s\n", v->value);
else
localaddr = na;
+ if (ha_error)
+ ast_log(LOG_ERROR, "Bad localnet configuration value line %d : %s\n", v->lineno, v->value);
} else if (!strcasecmp(v->name, "externip")) {
if (!(hp = ast_gethostbyname(v->value, &ahp)))
ast_log(LOG_WARNING, "Invalid address for externip keyword: %s\n", v->value);
@@ -16427,9 +16448,13 @@
externrefresh = 10;
}
} else if (!strcasecmp(v->name, "allow")) {
- ast_parse_allow_disallow(&default_prefs, &global_capability, v->value, 1);
+ int error = ast_parse_allow_disallow(&default_prefs, &global_capability, v->value, TRUE);
+ if (error)
+ ast_log(LOG_WARNING, "Codec configuration errors found in line %d : %s = %s\n", v->lineno, v->name, v->value);
} else if (!strcasecmp(v->name, "disallow")) {
- ast_parse_allow_disallow(&default_prefs, &global_capability, v->value, 0);
+ int error = ast_parse_allow_disallow(&default_prefs, &global_capability, v->value, FALSE);
+ if (error)
+ ast_log(LOG_WARNING, "Codec configuration errors found in line %d : %s = %s\n", v->lineno, v->name, v->value);
} else if (!strcasecmp(v->name, "autoframing")) {
global_autoframing = ast_true(v->value);
} else if (!strcasecmp(v->name, "allowexternaldomains")) {
Modified: team/russell/chan_console/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_skinny.c?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/channels/chan_skinny.c (original)
+++ team/russell/chan_console/channels/chan_skinny.c Mon Jan 1 19:53:24 2007
@@ -2027,7 +2027,7 @@
} else if (!strcasecmp(v->name, "device")) {
ast_copy_string(d->id, v->value, sizeof(d->id));
} else if (!strcasecmp(v->name, "permit") || !strcasecmp(v->name, "deny")) {
- d->ha = ast_append_ha(v->name, v->value, d->ha);
+ d->ha = ast_append_ha(v->name, v->value, d->ha, NULL);
} else if (!strcasecmp(v->name, "context")) {
ast_copy_string(context, v->value, sizeof(context));
} else if (!strcasecmp(v->name, "allow")) {
Modified: team/russell/chan_console/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_zap.c?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/channels/chan_zap.c (original)
+++ team/russell/chan_console/channels/chan_zap.c Mon Jan 1 19:53:24 2007
@@ -38,7 +38,7 @@
*/
/*** MODULEINFO
- <depend>zaptel</depend>
+ <depend>zaptel_vldtmf</depend>
<depend>tonezone</depend>
<use>pri</use>
<use>ss7</use>
Modified: team/russell/chan_console/codecs/codec_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/codecs/codec_zap.c?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/codecs/codec_zap.c (original)
+++ team/russell/chan_console/codecs/codec_zap.c Mon Jan 1 19:53:24 2007
@@ -27,7 +27,7 @@
*/
/*** MODULEINFO
- <depend>zaptel</depend>
+ <depend>zaptel_transcode</depend>
***/
#include "asterisk.h"
Modified: team/russell/chan_console/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/configs/sip.conf.sample?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/configs/sip.conf.sample (original)
+++ team/russell/chan_console/configs/sip.conf.sample Mon Jan 1 19:53:24 2007
@@ -105,6 +105,9 @@
; where some buggy devices might not render it
; Valid values: yes, no, never Default: never
;useragent=Asterisk PBX ; Allows you to change the user agent string
+ ; The default user agent string also contains the Asterisk
+ ; version. If you don't want to expose this, change the
+ ; useragent string.
;promiscredir = no ; If yes, allows 302 or REDIR to non-local SIP address
; Note that promiscredir when redirects are made to the
; local system will cause loops since Asterisk is incapable
Modified: team/russell/chan_console/configure
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/configure?view=diff&rev=49132&r1=49131&r2=49132
==============================================================================
--- team/russell/chan_console/configure (original)
+++ team/russell/chan_console/configure Mon Jan 1 19:53:24 2007
@@ -853,6 +853,8 @@
OPENH323_SUFFIX
OPENH323_BUILD
QTMOC
+PBX_ZAPTEL_VLDTMF
+PBX_ZAPTEL_TRANSCODE
EDITLINE_LIB
PBX_H323
PBX_IXJUSER
@@ -30459,11 +30461,10 @@
fi
-# check for zaptel 1.4.0
if test "x${PBX_ZAPTEL}" != "x1" -a "${USE_ZAPTEL}" != "no"; then
- { echo "$as_me:$LINENO: checking for ZT_TONE_DTMF_BASE in zaptel/zaptel.h" >&5
-echo $ECHO_N "checking for ZT_TONE_DTMF_BASE in zaptel/zaptel.h... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for ZT_DIAL_OP_CANCEL in zaptel/zaptel.h" >&5
+echo $ECHO_N "checking for ZT_DIAL_OP_CANCEL in zaptel/zaptel.h... $ECHO_C" >&6; }
saved_cppflags="${CPPFLAGS}"
if test "x${ZAPTEL_DIR}" != "x"; then
ZAPTEL_INCLUDE= "-I${ZAPTEL_DIR}/include"
@@ -30472,6 +30473,74 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <zaptel/zaptel.h>
+int
+main ()
+{
+int foo = ZT_DIAL_OP_CANCEL;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ PBX_ZAPTEL=1
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZAPTEL 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZAPTEL_VERSION
+_ACEOF
+
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS="${saved_cppflags}"
+ fi
+
+
+if test "${PBX_ZAPTEL}" = 1; then
+ { echo "$as_me:$LINENO: checking for ZT_TONE_DTMF_BASE in zaptel/zaptel.h" >&5
+echo $ECHO_N "checking for ZT_TONE_DTMF_BASE in zaptel/zaptel.h... $ECHO_C" >&6; }
+ saved_cppflags="${CPPFLAGS}"
+ if test "x${ZAPTEL_DIR}" != "x"; then
+ CPPFLAGS="${CPPFLAGS} -I${ZAPTEL_DIR}/include"
+ fi
+ cat >conftest.$ac_ext <<_ACEOF
+
+ /* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
@@ -30484,463 +30553,6 @@
;
return 0;
}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- PBX_ZAPTEL=1
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ZAPTEL 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ZAPTEL_VERSION 140
-_ACEOF
-
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CPPFLAGS="${saved_cppflags}"
- fi
-
-# or, try old zaptel (0.80 or so)
-
-if test "x${PBX_ZAPTEL}" != "x1" -a "${USE_ZAPTEL}" != "no"; then
- pbxlibdir=""
- if test "x${ZAPTEL_DIR}" != "x"; then
- if test -d ${ZAPTEL_DIR}/lib; then
- pbxlibdir="-L${ZAPTEL_DIR}/lib"
- else
- pbxlibdir="-L${ZAPTEL_DIR}"
- fi
- fi
- pbxfuncname=""
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_ZAPTEL_FOUND=yes
- else
- as_ac_Lib=`echo "ac_cv_lib_zaptel_${pbxfuncname}" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lzaptel" >&5
-echo $ECHO_N "checking for ${pbxfuncname} in -lzaptel... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lzaptel ${pbxlibdir} $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ${pbxfuncname} ();
-int
-main ()
-{
-return ${pbxfuncname} ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_Lib=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- AST_ZAPTEL_FOUND=yes
-else
- AST_ZAPTEL_FOUND=no
-fi
-
- fi
-
- if test "${AST_ZAPTEL_FOUND}" = "yes"; then
- ZAPTEL_LIB="-lzaptel "
- ZAPTEL_HEADER_FOUND="1"
- if test "x${ZAPTEL_DIR}" != "x"; then
- ZAPTEL_LIB="${pbxlibdir} ${ZAPTEL_LIB}"
- ZAPTEL_INCLUDE="-I${ZAPTEL_DIR}/include"
- if test "xzaptel.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${ZAPTEL_DIR}/include/zaptel.h" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/zaptel.h" >&5
-echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/zaptel.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/zaptel.h usability" >&5
-echo $ECHO_N "checking ${ZAPTEL_DIR}/include/zaptel.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <${ZAPTEL_DIR}/include/zaptel.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/zaptel.h presence" >&5
-echo $ECHO_N "checking ${ZAPTEL_DIR}/include/zaptel.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <${ZAPTEL_DIR}/include/zaptel.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/zaptel.h" >&5
-echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/zaptel.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- ZAPTEL_HEADER_FOUND=1
-else
- ZAPTEL_HEADER_FOUND=0
-fi
-
-
- fi
- else
- if test "xzaptel.h" != "x" ; then
- if test "${ac_cv_header_zaptel_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for zaptel.h" >&5
-echo $ECHO_N "checking for zaptel.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_zaptel_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_zaptel_h" >&5
-echo "${ECHO_T}$ac_cv_header_zaptel_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking zaptel.h usability" >&5
-echo $ECHO_N "checking zaptel.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <zaptel.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking zaptel.h presence" >&5
[... 671 lines stripped ...]
More information about the asterisk-commits
mailing list