[svn-commits] bbryant: branch bbryant/ssl-tcp-tls r72733 - /team/bbryant/ssl-tcp-tls/channels/

[SVN commits to the Digium repositories]

Author: bbryant
Date: Fri Jun 29 16:16:44 2007
New Revision: 72733

URL: http://svn.digium.com/view/asterisk?view=rev&rev=72733
Log:
Remove some erroneous changes.

Modified:
    team/bbryant/ssl-tcp-tls/channels/chan_sip.c

Modified: team/bbryant/ssl-tcp-tls/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/channels/chan_sip.c?view=diff&rev=72733&r1=72732&r2=72733
==============================================================================
--- team/bbryant/ssl-tcp-tls/channels/chan_sip.c (original)
+++ team/bbryant/ssl-tcp-tls/channels/chan_sip.c Fri Jun 29 16:16:44 2007
@@ -1296,7 +1296,7 @@
 static int sip_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration);
 
 #define get_transport(p) ( ( p->transport & SIP_TRANSPORT_UDP ) ? "UDP" : ( p->transport & SIP_TRANSPORT_TCP ) ? "TCP" : "TLS" )
-static int handle_request_do(struct sip_pvt *p, struct sip_request *req, struct sockaddr_in *sin, int transport, int fd);
+static int handle_request_do(struct sip_request *req, struct sockaddr_in *sin, int transport, int fd);
 
 /*--- Transmitting responses and requests */
 static int sipsock_read(int *id, int fd, short events, void *ignore);
@@ -1715,7 +1715,6 @@
 
 /*! \brief SIP TCP helper function */
 static void *sip_tcp_helper_thread(void *data) {
-	struct sip_pvt *p;
 	struct server_instance *ser = data;
 	int cl;
 	char buf[1024];
@@ -1749,7 +1748,7 @@
 			}
 		}
 
-		handle_request_do(p, &req, &ser->requestor, ((ser->parent->tls_cfg) ? SIP_TRANSPORT_TLS : SIP_TRANSPORT_TCP), ser->fd);
+		handle_request_do(&req, &ser->requestor, ((ser->parent->tls_cfg) ? SIP_TRANSPORT_TLS : SIP_TRANSPORT_TCP), ser->fd);
 	}
 
 	return NULL;
@@ -15891,12 +15890,13 @@
 		req.data[res] = '\0';
 	req.len = res;
 
-	handle_request_do(p, &req, &sin, SIP_TRANSPORT_UDP, sipsock);
+	handle_request_do(&req, &sin, SIP_TRANSPORT_UDP, sipsock);
 
 	return 1;
 }
 
-static int handle_request_do(struct sip_pvt *p, struct sip_request *req, struct sockaddr_in *sin, int transport, int fd) {
+static int handle_request_do(struct sip_request *req, struct sockaddr_in *sin, int transport, int fd) {
+	struct sip_pvt *p;
 	int recount = 0;
 	int nounlock = 0;
 	int lockretry;