[asterisk-commits] kpfleming: branch 1.6.0 r167730 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Jan  8 11:29:36 2009
New Revision: 167730

URL: http://svn.digium.com/view/asterisk?view=rev&rev=167730
Log:
Merged revisions 167720 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r167720 | kpfleming | 2009-01-08 11:26:03 -0600 (Thu, 08 Jan 2009) | 9 lines
  
  Merged revisions 167714 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r167714 | kpfleming | 2009-01-08 11:24:21 -0600 (Thu, 08 Jan 2009) | 1 line
    
    remove an unnecessary argument to queue_request()
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=167730&r1=167729&r2=167730
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Jan  8 11:29:36 2009
@@ -18714,7 +18714,7 @@
 	return 0;
 }
 
-static int queue_request(struct sip_pvt *p, const struct sip_request *req, const struct sockaddr_in *sin)
+static int queue_request(struct sip_pvt *p, const struct sip_request *req)
 {
 	struct sip_request *newreq;
 
@@ -18832,7 +18832,7 @@
 		append_history(p, "Rx", "%s / %s / %s", req->data, get_header(req, "CSeq"), req->rlPart2);
 
 	if (!lockretry) {
-		if (!queue_request(p, req, sin)) {
+		if (!queue_request(p, req)) {
 			/* the request has been queued for later handling */
 			sip_pvt_unlock(p);
 			ast_mutex_unlock(&netlock);