aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-11 18:29:43 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-11 18:29:43 +0000
commit00b5c55880527990fd756938378dfcc785ea920f (patch)
treecaa19a136da7f811eb717014a1c45299fc0cb092
parent8dc2231e144c23ea0b98e1c817194f8569c04147 (diff)
Add missing unlock to an exception condition in reload_config().
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@291109 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 109b46e83..413a03c58 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16740,9 +16740,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_request(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
@@ -19167,6 +19171,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: */