- sip_alloc failures are also caused by too few available file descriptors, so we can not

open socket for RTP (audio/video/rtcp).
  Error message change to clarify.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2006-04-07 16:22:28 +00:00
parent b479a91e97
commit 839ebd8e03

View File

@@ -3360,8 +3360,8 @@ static struct sip_pvt *find_call(struct sip_request *req, struct sockaddr_in *si
} }
} }
ast_mutex_unlock(&iflock); ast_mutex_unlock(&iflock);
p = sip_alloc(callid, sin, 1, intended_method); /* Allocate new call */
if (p) if ((p = sip_alloc(callid, sin, 1, intended_method)))
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
return p; return p;
} }
@@ -5531,9 +5531,8 @@ static int transmit_register(struct sip_registry *r, int sipmethod, char *auth,
r->callid_valid = TRUE; r->callid_valid = TRUE;
} }
/* Allocate SIP packet for registration */ /* Allocate SIP packet for registration */
p=sip_alloc( r->callid, NULL, 0, SIP_REGISTER); if (!(p = sip_alloc( r->callid, NULL, 0, SIP_REGISTER))) {
if (!p) { ast_log(LOG_WARNING, "Unable to allocate registration transaction (memory or socket error)\n");
ast_log(LOG_WARNING, "Unable to allocate registration call\n");
return 0; return 0;
} }
if (recordhistory) if (recordhistory)
@@ -9060,9 +9059,8 @@ static int sip_notify(int fd, int argc, char *argv[])
struct sip_request req; struct sip_request req;
struct ast_variable *var; struct ast_variable *var;
p = sip_alloc(NULL, NULL, 0, SIP_NOTIFY); if (!(p = sip_alloc(NULL, NULL, 0, SIP_NOTIFY))) {
if (!p) { ast_log(LOG_WARNING, "Unable to build sip pvt data for notify (memory/socket error)\n");
ast_log(LOG_WARNING, "Unable to build sip pvt data for notify\n");
return RESULT_FAILURE; return RESULT_FAILURE;
} }
@@ -11752,7 +11750,7 @@ static int sip_send_mwi_to_peer(struct sip_peer *peer)
p = peer->mwipvt; p = peer->mwipvt;
} else { } else {
/* Build temporary dialog for this message */ /* Build temporary dialog for this message */
if (!(p = sip_alloc(NULL, NULL, 0, SIP_NOTIFY))) if (!(p = sip_alloc(NULL, NULL, 0, SIP_NOTIFY)))
return -1; return -1;
if (create_addr_from_peer(p, peer)) { if (create_addr_from_peer(p, peer)) {
/* Maybe they're not registered, etc. */ /* Maybe they're not registered, etc. */
@@ -12120,7 +12118,7 @@ static struct ast_channel *sip_request_call(const char *type, int format, void *
return NULL; return NULL;
} }
if (!(p = sip_alloc(NULL, NULL, 0, SIP_INVITE))) { if (!(p = sip_alloc(NULL, NULL, 0, SIP_INVITE))) {
ast_log(LOG_ERROR, "Unable to build sip pvt data for '%s' (Out of memory)\n", (char *)data); ast_log(LOG_ERROR, "Unable to build sip pvt data for '%s' (Out of memory or socket error)\n", (char *)data);
*cause = AST_CAUSE_SWITCH_CONGESTION; *cause = AST_CAUSE_SWITCH_CONGESTION;
return NULL; return NULL;
} }