[svn-commits] tilghman: branch group/manager_http_auth r188465 - /team/group/manager_http_a...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Apr 14 17:53:37 2009
New Revision: 188465

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=188465
Log:
Tracked down the source of that error

Modified:
    team/group/manager_http_auth/main/astobj2.c
    team/group/manager_http_auth/main/manager.c

Modified: team/group/manager_http_auth/main/astobj2.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/manager_http_auth/main/astobj2.c?view=diff&rev=188465&r1=188464&r2=188465
==============================================================================
--- team/group/manager_http_auth/main/astobj2.c (original)
+++ team/group/manager_http_auth/main/astobj2.c Tue Apr 14 17:53:37 2009
@@ -113,17 +113,7 @@
 
 	p = (struct astobj2 *) ((char *) user_data - sizeof(*p));
 	if (AO2_MAGIC != (p->priv_data.magic) ) {
-		unsigned char *a;
-		int i = 0;
-		char data[sizeof(p->priv_data) * 3 + 1] = "";
-		for (a = (unsigned char *)&p->priv_data; a < (unsigned char *)&p->priv_data + sizeof(p->priv_data); a++) {
-			unsigned char n1 = *a >> 4, n2 = *a & 0xf;
-			data[i++] = n1 < 10 ? '0' + n1 : 'A' + n1 - 10;
-			data[i++] = n2 < 10 ? '0' + n2 : 'A' + n2 - 10;
-			data[i++] = ' ';
-		}
 		ast_log(LOG_ERROR, "bad magic number 0x%x for %p\n", p->priv_data.magic, p);
-		ast_log(LOG_ERROR, "Raw privdata dump: %s\n", data);
 		p = NULL;
 	}
 

Modified: team/group/manager_http_auth/main/manager.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/manager_http_auth/main/manager.c?view=diff&rev=188465&r1=188464&r2=188465
==============================================================================
--- team/group/manager_http_auth/main/manager.c (original)
+++ team/group/manager_http_auth/main/manager.c Tue Apr 14 17:53:37 2009
@@ -51,8 +51,6 @@
 #include <sys/time.h>
 #include <signal.h>
 #include <sys/mman.h>
-
-#define REF_DEBUG	1
 
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
@@ -2794,7 +2792,7 @@
 {
 	int ret = 0;
 
-	ao2_lock(s);
+	ao2_lock(s->session);
 	if (s->session->f != NULL) {
 		struct eventqent *eqe;
 
@@ -2809,7 +2807,7 @@
 			s->session->last_ev = unref_event(s->session->last_ev);
 		}
 	}
-	ao2_unlock(s);
+	ao2_unlock(s->session);
 	return ret;
 }