diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-20 21:13:12 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-20 21:13:12 +0000 |
| commit | c9b1bd8b5213b9309b16cb6f42a757b3e79acd3e (patch) | |
| tree | c5e9ec5c15030b6db441050607a0947058c4a9ff /asterisk.c | |
| parent | 87e7c952733a6fc60f1f348be3465ec4b8489ab6 (diff) | |
Correctly handle call flow with outgoing queue, avoiding retries while call acti
ve (bug #1018)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2505 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
| -rwxr-xr-x | asterisk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asterisk.c b/asterisk.c index 9cff2c73d..2811a7cad 100755 --- a/asterisk.c +++ b/asterisk.c @@ -65,7 +65,7 @@ int fully_booted = 0; static int ast_socket = -1; /* UNIX Socket for allowing remote control */ static int ast_consock = -1; /* UNIX Socket for controlling another asterisk */ -static int mainpid; +int ast_mainpid; struct console { int fd; /* File descriptor */ int p[2]; /* Pipe */ @@ -196,7 +196,7 @@ static void *netconsole(void *vconsole) if (gethostname(hostname, sizeof(hostname))) strncpy(hostname, "<Unknown>", sizeof(hostname)-1); - snprintf(tmp, sizeof(tmp), "%s/%d/%s\n", hostname, mainpid, ASTERISK_VERSION); + snprintf(tmp, sizeof(tmp), "%s/%d/%s\n", hostname, ast_mainpid, ASTERISK_VERSION); fdprint(con->fd, tmp); for(;;) { FD_ZERO(&rfds); @@ -1271,7 +1271,7 @@ int main(int argc, char *argv[]) } if (gethostname(hostname, sizeof(hostname))) strncpy(hostname, "<Unknown>", sizeof(hostname)-1); - mainpid = getpid(); + ast_mainpid = getpid(); ast_ulaw_init(); ast_alaw_init(); callerid_init(); @@ -1500,7 +1500,7 @@ int main(int argc, char *argv[]) /* Register our quit function */ char title[256]; set_icon("Asterisk"); - snprintf(title, sizeof(title), "Asterisk Console on '%s' (pid %d)", hostname, mainpid); + snprintf(title, sizeof(title), "Asterisk Console on '%s' (pid %d)", hostname, ast_mainpid); set_title(title); ast_cli_register(&quit); ast_cli_register(&astexit); |