[asterisk-commits] russell: branch russell/sla_rewrite r53048 - in
/team/russell/sla_rewrite: ./...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Jan 31 14:43:30 MST 2007
Author: russell
Date: Wed Jan 31 15:43:29 2007
New Revision: 53048
URL: http://svn.digium.com/view/asterisk?view=rev&rev=53048
Log:
Merged revisions 53035,53037,53040,53042,53046 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r53035 | russell | 2007-01-31 11:34:22 -0600 (Wed, 31 Jan 2007) | 4 lines
Instead of always creating a realtime queue member as unpaused, read the
"paused" column and use that value for the paused status of the member.
(issue #8949, jmls)
................
r53037 | russell | 2007-01-31 11:39:28 -0600 (Wed, 31 Jan 2007) | 3 lines
Only changed the paused status in an existing queue member if the paused
column exists.
................
r53040 | russell | 2007-01-31 11:45:05 -0600 (Wed, 31 Jan 2007) | 11 lines
Merged revisions 53039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r53039 | russell | 2007-01-31 11:41:51 -0600 (Wed, 31 Jan 2007) | 3 lines
Use the proper format string to print unsigned values in the rtp debug output.
(issue #8954, wmis)
........
................
r53042 | russell | 2007-01-31 12:18:25 -0600 (Wed, 31 Jan 2007) | 2 lines
Remove an extra \r\n from manager user events. (issue #8955, mnicholson)
................
r53046 | russell | 2007-01-31 15:32:08 -0600 (Wed, 31 Jan 2007) | 11 lines
Merged revisions 53045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r53045 | russell | 2007-01-31 15:25:11 -0600 (Wed, 31 Jan 2007) | 3 lines
Fix a bunch of places where pthread_attr_init() was called, but
pthread_attr_destroy() was not.
........
................
Modified:
team/russell/sla_rewrite/ (props changed)
team/russell/sla_rewrite/apps/app_meetme.c
team/russell/sla_rewrite/apps/app_queue.c
team/russell/sla_rewrite/apps/app_rpt.c
team/russell/sla_rewrite/apps/app_userevent.c
team/russell/sla_rewrite/channels/chan_h323.c
team/russell/sla_rewrite/channels/chan_iax2.c
team/russell/sla_rewrite/channels/chan_mgcp.c
team/russell/sla_rewrite/channels/chan_sip.c
team/russell/sla_rewrite/channels/chan_skinny.c
team/russell/sla_rewrite/channels/chan_zap.c
team/russell/sla_rewrite/main/cdr.c
team/russell/sla_rewrite/main/http.c
team/russell/sla_rewrite/main/manager.c
team/russell/sla_rewrite/main/pbx.c
team/russell/sla_rewrite/main/rtp.c
team/russell/sla_rewrite/pbx/pbx_dundi.c
team/russell/sla_rewrite/pbx/pbx_spool.c
Propchange: team/russell/sla_rewrite/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/russell/sla_rewrite/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 31 15:43:29 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-53028
+/branches/1.4:1-53047
Modified: team/russell/sla_rewrite/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/apps/app_meetme.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/apps/app_meetme.c (original)
+++ team/russell/sla_rewrite/apps/app_meetme.c Wed Jan 31 15:43:29 2007
@@ -1141,6 +1141,7 @@
pthread_attr_init(&conf->attr);
pthread_attr_setdetachstate(&conf->attr, PTHREAD_CREATE_DETACHED);
ast_pthread_create_background(&conf->recordthread, &conf->attr, recordthread, conf);
+ pthread_attr_destroy(&conf->attr);
}
time(&user->jointime);
Modified: team/russell/sla_rewrite/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/apps/app_queue.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/apps/app_queue.c (original)
+++ team/russell/sla_rewrite/apps/app_queue.c Wed Jan 31 15:43:29 2007
@@ -609,6 +609,7 @@
ast_log(LOG_WARNING, "Failed to create update thread!\n");
free(sc);
}
+ pthread_attr_destroy(&attr);
return 0;
}
@@ -921,10 +922,11 @@
}
}
-static void rt_handle_member_record(struct call_queue *q, char *interface, const char *membername, const char *penalty_str)
+static void rt_handle_member_record(struct call_queue *q, char *interface, const char *membername, const char *penalty_str, const char *paused_str)
{
struct member *m, *prev_m;
int penalty = 0;
+ int paused = 0;
if (penalty_str) {
penalty = atoi(penalty_str);
@@ -932,6 +934,12 @@
penalty = 0;
}
+ if (paused_str) {
+ paused = atoi(paused_str);
+ if (paused < 0)
+ paused = 0;
+ }
+
/* Find the member, or the place to put a new one. */
for (m = q->members, prev_m = NULL;
m && strcmp(m->interface, interface);
@@ -939,7 +947,7 @@
/* Create a new one if not found, else update penalty */
if (!m) {
- if ((m = create_queue_member(interface, membername, penalty, 0))) {
+ if ((m = create_queue_member(interface, membername, penalty, paused))) {
m->dead = 0;
add_to_interfaces(interface);
if (prev_m) {
@@ -950,6 +958,8 @@
}
} else {
m->dead = 0; /* Do not delete this one. */
+ if (paused_str)
+ m->paused = paused;
m->penalty = penalty;
}
}
@@ -1073,7 +1083,8 @@
while ((interface = ast_category_browse(member_config, interface))) {
rt_handle_member_record(q, interface,
S_OR(ast_variable_retrieve(member_config, interface, "membername"), interface),
- ast_variable_retrieve(member_config, interface, "penalty"));
+ ast_variable_retrieve(member_config, interface, "penalty"),
+ ast_variable_retrieve(member_config, interface, "paused"));
}
/* Delete all realtime members that have been deleted in DB. */
Modified: team/russell/sla_rewrite/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/apps/app_rpt.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/apps/app_rpt.c (original)
+++ team/russell/sla_rewrite/apps/app_rpt.c Wed Jan 31 15:43:29 2007
@@ -2613,6 +2613,7 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
res = ast_pthread_create(&tele->threadid,&attr,rpt_tele_thread,(void *) tele);
+ pthread_attr_destroy(&attr);
if(res < 0){
rpt_mutex_lock(&myrpt->lock);
remque((struct qlem *) tele); /* We don't like stuck transmitters, remove it from the queue */
@@ -3380,6 +3381,7 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
ast_pthread_create(&myrpt->rpt_call_thread,&attr,rpt_call,(void *) myrpt);
+ pthread_attr_destroy(&attr);
return DC_COMPLETE;
}
@@ -5936,6 +5938,7 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
ast_pthread_create(&myrpt->rpt_call_thread,&attr,rpt_call,(void *)myrpt);
+ pthread_attr_destroy(&attr);
return;
}
}
@@ -7219,6 +7222,7 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
ast_pthread_create(&rpt_vars[i].rpt_thread,&attr,rpt,(void *) &rpt_vars[i]);
+ pthread_attr_destroy(&attr);
}
usleep(500000);
for(;;)
@@ -7254,6 +7258,7 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
ast_pthread_create(&rpt_vars[i].rpt_thread,&attr,rpt,(void *) &rpt_vars[i]);
+ pthread_attr_destroy(&attr);
ast_log(LOG_WARNING, "rpt_thread restarted on node %s\n", rpt_vars[i].name);
}
Modified: team/russell/sla_rewrite/apps/app_userevent.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/apps/app_userevent.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/apps/app_userevent.c (original)
+++ team/russell/sla_rewrite/apps/app_userevent.c Wed Jan 31 15:43:29 2007
@@ -83,7 +83,7 @@
buflen += 2;
}
- manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s\r\n", args.eventname, buf);
+ manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", args.eventname, buf);
ast_module_user_remove(u);
Modified: team/russell/sla_rewrite/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/channels/chan_h323.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/channels/chan_h323.c (original)
+++ team/russell/sla_rewrite/channels/chan_h323.c Wed Jan 31 15:43:29 2007
@@ -2524,8 +2524,10 @@
monitor_thread = AST_PTHREADT_NULL;
ast_mutex_unlock(&monlock);
ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
+ pthread_attr_destroy(&attr);
return -1;
}
+ pthread_attr_destroy(&attr);
}
ast_mutex_unlock(&monlock);
return 0;
Modified: team/russell/sla_rewrite/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/channels/chan_iax2.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/channels/chan_iax2.c (original)
+++ team/russell/sla_rewrite/channels/chan_iax2.c Wed Jan 31 15:43:29 2007
@@ -6059,6 +6059,8 @@
if (ast_pthread_create(&newthread, &attr, dp_lookup_thread, dpr)) {
ast_log(LOG_WARNING, "Unable to start lookup thread!\n");
}
+
+ pthread_attr_destroy(&attr);
}
struct iax_dual {
@@ -6133,8 +6135,11 @@
d->chan1 = chan1m;
d->chan2 = chan2m;
- if (!ast_pthread_create_background(&th, &attr, iax_park_thread, d))
+ if (!ast_pthread_create_background(&th, &attr, iax_park_thread, d)) {
+ pthread_attr_destroy(&attr);
return 0;
+ }
+ pthread_attr_destroy(&attr);
free(d);
}
return -1;
Modified: team/russell/sla_rewrite/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/channels/chan_mgcp.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/channels/chan_mgcp.c (original)
+++ team/russell/sla_rewrite/channels/chan_mgcp.c Wed Jan 31 15:43:29 2007
@@ -2995,6 +2995,7 @@
/*ast_queue_control(sub->owner, AST_CONTROL_ANSWER);*/
}
}
+ pthread_attr_destroy(&attr);
}
static int handle_request(struct mgcp_subchannel *sub, struct mgcp_request *req, struct sockaddr_in *sin)
Modified: team/russell/sla_rewrite/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/channels/chan_sip.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/channels/chan_sip.c (original)
+++ team/russell/sla_rewrite/channels/chan_sip.c Wed Jan 31 15:43:29 2007
@@ -12638,8 +12638,10 @@
/* Could not start thread */
free(d); /* We don't need it anymore. If thread is created, d will be free'd
by sip_park_thread() */
+ pthread_attr_destroy(&attr);
return 0;
}
+ pthread_attr_destroy(&attr);
}
return -1;
}
Modified: team/russell/sla_rewrite/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/channels/chan_skinny.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/channels/chan_skinny.c (original)
+++ team/russell/sla_rewrite/channels/chan_skinny.c Wed Jan 31 15:43:29 2007
@@ -4302,6 +4302,7 @@
if (skinnydebug)
ast_verbose("killing accept thread\n");
close(as);
+ pthread_attr_destroy(&attr);
return 0;
}
Modified: team/russell/sla_rewrite/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/channels/chan_zap.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/channels/chan_zap.c (original)
+++ team/russell/sla_rewrite/channels/chan_zap.c Wed Jan 31 15:43:29 2007
@@ -3590,9 +3590,6 @@
pthread_t threadid;
pthread_attr_t attr;
struct ast_channel *chan;
-
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
index = zt_get_index(ast, p, 0);
mysig = p->sig;
@@ -4178,6 +4175,8 @@
if (res)
ast_log(LOG_WARNING, "Unable to start dial recall tone on channel %d\n", p->channel);
p->owner = chan;
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (!chan) {
ast_log(LOG_WARNING, "Cannot allocate new structure on channel %d\n", p->channel);
} else if (ast_pthread_create(&threadid, &attr, ss_thread, chan)) {
@@ -4195,7 +4194,8 @@
!ast_strlen_zero(p->mohsuggest) ? strlen(p->mohsuggest) + 1 : 0);
}
p->subs[SUB_THREEWAY].needhold = 1;
- }
+ }
+ pthread_attr_destroy(&attr);
}
} else {
/* Already have a 3 way call */
@@ -6686,6 +6686,7 @@
"interface %d\n", i->channel);
}
}
+ pthread_attr_destroy(&attr);
return 0;
}
@@ -6908,10 +6909,12 @@
if (ast_pthread_create_background(&monitor_thread, &attr, do_monitor, NULL) < 0) {
ast_mutex_unlock(&monlock);
ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
+ pthread_attr_destroy(&attr);
return -1;
}
}
ast_mutex_unlock(&monlock);
+ pthread_attr_destroy(&attr);
return 0;
}
@@ -8248,9 +8251,6 @@
char plancallingani[256];
char calledtonstr[10];
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
gettimeofday(&lastidle, NULL);
if (!ast_strlen_zero(pri->idledial) && !ast_strlen_zero(pri->idleext)) {
/* Need to do idle dialing, check to be sure though */
@@ -8741,6 +8741,8 @@
pbx_builtin_setvar_helper(c, "PRIREDIRECTREASON", redirectingreason2str(e->ring.redirectingreason));
ast_mutex_lock(&pri->lock);
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (c && !ast_pthread_create(&threadid, &attr, ss_thread, c)) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Accepting overlap call from '%s' to '%s' on channel %d/%d, span %d\n",
@@ -8756,6 +8758,7 @@
pri->pvts[chanpos]->call = NULL;
}
}
+ pthread_attr_destroy(&attr);
} else {
ast_mutex_unlock(&pri->lock);
/* Release PRI lock while we create the channel */
Modified: team/russell/sla_rewrite/main/cdr.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/main/cdr.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/main/cdr.c (original)
+++ team/russell/sla_rewrite/main/cdr.c Wed Jan 31 15:43:29 2007
@@ -860,6 +860,7 @@
if (option_debug)
ast_log(LOG_DEBUG, "CDR multi-threaded batch processing begins now\n");
}
+ pthread_attr_destroy(&attr);
}
}
Modified: team/russell/sla_rewrite/main/http.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/main/http.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/main/http.c (original)
+++ team/russell/sla_rewrite/main/http.c Wed Jan 31 15:43:29 2007
@@ -539,6 +539,7 @@
fclose(ser->f);
free(ser);
}
+ pthread_attr_destroy(&attr);
} else {
ast_log(LOG_WARNING, "fdopen failed!\n");
close(ser->fd);
Modified: team/russell/sla_rewrite/main/manager.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/main/manager.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/main/manager.c (original)
+++ team/russell/sla_rewrite/main/manager.c Wed Jan 31 15:43:29 2007
@@ -1752,6 +1752,7 @@
} else {
res = 0;
}
+ pthread_attr_destroy(&attr);
}
} else if (!ast_strlen_zero(app)) {
res = ast_pbx_outgoing_app(tech, AST_FORMAT_SLINEAR, data, to, app, appdata, &reason, 1, l, n, vars, account, NULL);
Modified: team/russell/sla_rewrite/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/main/pbx.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/main/pbx.c (original)
+++ team/russell/sla_rewrite/main/pbx.c Wed Jan 31 15:43:29 2007
@@ -2585,8 +2585,10 @@
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (ast_pthread_create(&t, &attr, pbx_thread, c)) {
ast_log(LOG_WARNING, "Failed to create new channel thread\n");
+ pthread_attr_destroy(&attr);
return AST_PBX_FAILED;
}
+ pthread_attr_destroy(&attr);
return AST_PBX_SUCCESS;
}
@@ -5048,8 +5050,10 @@
}
ast_hangup(chan);
res = -1;
+ pthread_attr_destroy(&attr);
goto outgoing_exten_cleanup;
}
+ pthread_attr_destroy(&attr);
res = 0;
}
outgoing_exten_cleanup:
@@ -5151,6 +5155,7 @@
if (locked_channel)
*locked_channel = chan;
}
+ pthread_attr_destroy(&attr);
}
}
} else {
@@ -5209,11 +5214,13 @@
ast_channel_unlock(chan);
ast_hangup(chan);
res = -1;
+ pthread_attr_destroy(&attr);
goto outgoing_app_cleanup;
} else {
if (locked_channel)
*locked_channel = chan;
}
+ pthread_attr_destroy(&attr);
res = 0;
}
outgoing_app_cleanup:
Modified: team/russell/sla_rewrite/main/rtp.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/main/rtp.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/main/rtp.c (original)
+++ team/russell/sla_rewrite/main/rtp.c Wed Jan 31 15:43:29 2007
@@ -1067,7 +1067,7 @@
}
return 0;
} else if (rtp_debug_test_addr(&bridged->them))
- ast_verbose("Sent RTP P2P packet to %s:%d (type %-2.2d, len %-6.6u)\n", ast_inet_ntoa(bridged->them.sin_addr), ntohs(bridged->them.sin_port), bridged_payload, len - hdrlen);
+ ast_verbose("Sent RTP P2P packet to %s:%u (type %-2.2d, len %-6.6u)\n", ast_inet_ntoa(bridged->them.sin_addr), ntohs(bridged->them.sin_port), bridged_payload, len - hdrlen);
return 0;
}
@@ -1215,7 +1215,7 @@
rtp->themssrc = ntohl(rtpheader[2]); /* Record their SSRC to put in future RR */
if (rtp_debug_test_addr(&sin))
- ast_verbose("Got RTP packet from %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+ ast_verbose("Got RTP packet from %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp,res - hdrlen);
rtpPT = ast_rtp_lookup_pt(rtp, payloadtype);
@@ -1238,7 +1238,7 @@
event_end >>= 24;
duration = ntohl(*((unsigned int *)(data)));
duration &= 0xFFFF;
- ast_verbose("Got RTP RFC2833 from %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d) \n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration);
+ ast_verbose("Got RTP RFC2833 from %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d) \n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration);
}
f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen, seqno);
} else if (rtpPT.code == AST_RTP_CISCO_DTMF) {
@@ -2123,11 +2123,11 @@
rtpheader[3] = htonl((digit << 24) | (0xa << 16) | (rtp->send_duration));
res = sendto(rtp->s, (void *) rtpheader, hdrlen + 4, 0, (struct sockaddr *) &rtp->them, sizeof(rtp->them));
if (res < 0)
- ast_log(LOG_ERROR, "RTP Transmission error to %s:%d: %s\n",
+ ast_log(LOG_ERROR, "RTP Transmission error to %s:%u: %s\n",
ast_inet_ntoa(rtp->them.sin_addr),
ntohs(rtp->them.sin_port), strerror(errno));
if (rtp_debug_test_addr(&rtp->them))
- ast_verbose("Sent RTP DTMF packet to %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+ ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
ast_inet_ntoa(rtp->them.sin_addr),
ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
/* Increment sequence number */
@@ -2171,7 +2171,7 @@
ast_inet_ntoa(rtp->them.sin_addr),
ntohs(rtp->them.sin_port), strerror(errno));
if (rtp_debug_test_addr(&rtp->them))
- ast_verbose("Sent RTP DTMF packet to %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+ ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
ast_inet_ntoa(rtp->them.sin_addr),
ntohs(rtp->them.sin_port), rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
@@ -2227,7 +2227,7 @@
ast_inet_ntoa(rtp->them.sin_addr),
ntohs(rtp->them.sin_port), strerror(errno));
if (rtp_debug_test_addr(&rtp->them))
- ast_verbose("Sent RTP DTMF packet to %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+ ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
ast_inet_ntoa(rtp->them.sin_addr),
ntohs(rtp->them.sin_port), rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
}
@@ -2507,7 +2507,7 @@
if (res <0)
ast_log(LOG_ERROR, "RTP Comfort Noise Transmission error to %s:%d: %s\n", ast_inet_ntoa(rtp->them.sin_addr), ntohs(rtp->them.sin_port), strerror(errno));
if (rtp_debug_test_addr(&rtp->them))
- ast_verbose("Sent Comfort Noise RTP packet to %s:%d (type %d, seq %d, ts %u, len %d)\n"
+ ast_verbose("Sent Comfort Noise RTP packet to %s:%u (type %d, seq %u, ts %u, len %d)\n"
, ast_inet_ntoa(rtp->them.sin_addr), ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastts,res - hdrlen);
}
@@ -2594,7 +2594,7 @@
}
if (rtp_debug_test_addr(&rtp->them))
- ast_verbose("Sent RTP packet to %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+ ast_verbose("Sent RTP packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
ast_inet_ntoa(rtp->them.sin_addr), ntohs(rtp->them.sin_port), codec, rtp->seqno, rtp->lastts,res - hdrlen);
}
Modified: team/russell/sla_rewrite/pbx/pbx_dundi.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/pbx/pbx_dundi.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/pbx/pbx_dundi.c (original)
+++ team/russell/sla_rewrite/pbx/pbx_dundi.c Wed Jan 31 15:43:29 2007
@@ -783,8 +783,10 @@
memset(&ied, 0, sizeof(ied));
dundi_ie_append_cause(&ied, DUNDI_IE_CAUSE, DUNDI_CAUSE_GENERAL, "Out of threads");
dundi_send(trans, DUNDI_COMMAND_EIDRESPONSE, 0, 1, &ied);
+ pthread_attr_destroy(&attr);
return -1;
}
+ pthread_attr_destroy(&attr);
} else {
ast_log(LOG_WARNING, "Out of memory!\n");
memset(&ied, 0, sizeof(ied));
@@ -1009,8 +1011,10 @@
memset(&ied, 0, sizeof(ied));
dundi_ie_append_cause(&ied, DUNDI_IE_CAUSE, DUNDI_CAUSE_GENERAL, "Out of threads");
dundi_send(trans, DUNDI_COMMAND_PRECACHERP, 0, 1, &ied);
+ pthread_attr_destroy(&attr);
return -1;
}
+ pthread_attr_destroy(&attr);
} else {
ast_log(LOG_WARNING, "Out of memory!\n");
memset(&ied, 0, sizeof(ied));
@@ -1095,8 +1099,10 @@
memset(&ied, 0, sizeof(ied));
dundi_ie_append_cause(&ied, DUNDI_IE_CAUSE, DUNDI_CAUSE_GENERAL, "Out of threads");
dundi_send(trans, DUNDI_COMMAND_DPRESPONSE, 0, 1, &ied);
+ pthread_attr_destroy(&attr);
return -1;
}
+ pthread_attr_destroy(&attr);
} else {
ast_log(LOG_WARNING, "Out of memory!\n");
memset(&ied, 0, sizeof(ied));
Modified: team/russell/sla_rewrite/pbx/pbx_spool.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/pbx/pbx_spool.c?view=diff&rev=53048&r1=53047&r2=53048
==============================================================================
--- team/russell/sla_rewrite/pbx/pbx_spool.c (original)
+++ team/russell/sla_rewrite/pbx/pbx_spool.c Wed Jan 31 15:43:29 2007
@@ -367,6 +367,7 @@
ast_log(LOG_WARNING, "Unable to create thread :( (returned error: %d)\n", ret);
free_outgoing(o);
}
+ pthread_attr_destroy(&attr);
}
static int scan_service(char *fn, time_t now, time_t atime)
@@ -499,6 +500,7 @@
ast_log(LOG_WARNING, "Unable to create thread :( (returned error: %d)\n", ret);
return -1;
}
+ pthread_attr_destroy(&attr);
return 0;
}
More information about the asterisk-commits
mailing list