diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-11 18:34:22 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-11 18:34:22 +0000 |
| commit | 49a90a025c47738ba781f8ccf52c83e21b73f6bf (patch) | |
| tree | b783f29ba67e5d795041f5bf0251d5742d58e6f5 /channels | |
| parent | c57d2dc6360d205a683d9f1be75ac85f2a925f76 (diff) | |
Merged revisions 291109 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r291109 | rmudgett | 2010-10-11 13:29:43 -0500 (Mon, 11 Oct 2010) | 1 line
Add missing unlock to an exception condition in reload_config().
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@291110 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b87d32b04..36f758439 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -21753,9 +21753,13 @@ static int handle_request_register(struct sip_pvt *p, struct sip_request *req, s return res; } -/*! \brief Handle incoming SIP requests (methods) -\note This is where all incoming requests go first */ -/* called with p and p->owner locked */ +/*! + * \brief Handle incoming SIP requests (methods) + * \note + * This is where all incoming requests go first. + * \note + * called with p and p->owner locked + */ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct sockaddr_in *sin, int *recount, int *nounlock) { /* Called with p->lock held, as well as p->owner->lock if appropriate, keeping things @@ -25207,6 +25211,7 @@ static int reload_config(enum channelreloadreason reason) if (sipsock < 0) { ast_log(LOG_WARNING, "Unable to create SIP socket: %s\n", strerror(errno)); ast_config_destroy(cfg); + ast_mutex_unlock(&netlock); return -1; } else { /* Allow SIP clients on the same host to access us: */ |