Merged revisions 317281 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r317281 | russell | 2011-05-05 13:39:44 -0500 (Thu, 05 May 2011) | 29 lines
  
  Merged revisions 317255 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r317255 | russell | 2011-05-05 13:29:53 -0500 (Thu, 05 May 2011) | 22 lines
    
    Merged revisions 317211 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r317211 | russell | 2011-05-05 13:20:29 -0500 (Thu, 05 May 2011) | 15 lines
      
      chan_sip: fix broken realtime peer count, fix memory leak
      
      This patch addresses two bugs in chan_sip:
      
      1) The count of realtime peers and users was off.  The increment checked the
      value of the caching option, while the decrement did not.
      
      2) Add a missing regfree() for a regex.
      
      (closes issue #19108)
      Reported by: vrban
      Patches:
            missing_regfree.patch uploaded by vrban (license 756)
            sip_object_counter.patch uploaded by vrban (license 756)
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317282 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 9 insertions, 2 deletions

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 09aec761f..6d532760f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4512,7 +4512,7 @@ static void sip_destroy_peer(struct sip_peer *peer)
 	ast_free_ha(peer->directmediaha);
 	if (peer->selfdestruct)
 		ast_atomic_fetchadd_int(&apeerobjs, -1);
-	else if (peer->is_realtime) {
+	else if (!ast_test_flag(&global_flags[1], SIP_PAGE2_RTCACHEFRIENDS) && peer->is_realtime) {
 		ast_atomic_fetchadd_int(&rpeerobjs, -1);
 		ast_debug(3, "-REALTIME- peer Destroyed. Name: %s. Realtime Peer objects: %d\n", peer->name, rpeerobjs);
 	} else
@@ -16562,6 +16562,7 @@ static char *sip_prune_realtime(struct ast_cli_entry *e, int cmd, struct ast_cli
 	int multi = FALSE;
 	const char *name = NULL;
 	regex_t regexbuf;
+	int havepattern = 0;
 	struct ao2_iterator i;
 	static const char * const choices[] = { "all", "like", NULL };
 	char *cmplt;
@@ -16630,8 +16631,10 @@ static char *sip_prune_realtime(struct ast_cli_entry *e, int cmd, struct ast_cli
 	}
 
 	if (multi && name) {
-		if (regcomp(&regexbuf, name, REG_EXTENDED | REG_NOSUB))
+		if (regcomp(&regexbuf, name, REG_EXTENDED | REG_NOSUB)) {
 			return CLI_SHOWUSAGE;
+		}
+		havepattern = 1;
 	}
 
 	if (multi) {
@@ -16683,6 +16686,10 @@ static char *sip_prune_realtime(struct ast_cli_entry *e, int cmd, struct ast_cli
 		}
 	}
 
+	if (havepattern) {
+		regfree(&regexbuf);
+	}
+
 	return CLI_SUCCESS;
 }