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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@291110 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b87d32b04fa96ed1e83af3c38413866155020fb7..36f758439d15e58fad3093e7dd8822c848f45590 100644 (file)
--- 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: */