From: <no...@so...> - 2008-12-13 11:07:27
|
Update of /cvsroot/ijbswa/current In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2614 Modified Files: gateway.c Log Message: Remove duplicated debugging checks in connection_destination_matches(). Index: gateway.c =================================================================== RCS file: /cvsroot/ijbswa/current/gateway.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- gateway.c 4 Dec 2008 18:17:07 -0000 1.45 +++ gateway.c 13 Dec 2008 11:07:23 -0000 1.46 @@ -34,6 +34,10 @@ * * Revisions : * $Log$ + * Revision 1.46 2008/12/13 11:07:23 fabiankeil + * Remove duplicated debugging checks + * in connection_destination_matches(). + * * Revision 1.45 2008/12/04 18:17:07 fabiankeil * Fix some cparser warnings. * @@ -564,7 +568,7 @@ * Function : connection_destination_matches * * Description : Determines whether a remembered connection can - * be reused. That is whether the destination and + * be reused. That is, whether the destination and * the forwarding settings match. * * Parameters : @@ -579,39 +583,6 @@ const struct http_request *http, const struct forward_spec *fwd) { - /* XXX: Start of duplicated checks for debugging purposes. */ - if (strcmpic(connection->host, http->host)) - { - return FALSE; - } - - if (connection->forwarder_type != fwd->type) - { - log_error(LOG_LEVEL_CONNECT, "Type mismatch: %d %d (%s)", - connection->forwarder_type, fwd->type, http->host); - return FALSE; - } - if (connection->gateway_port != fwd->gateway_port) - { - log_error(LOG_LEVEL_CONNECT, "Gateway port mismatch: %d %d (%s)", - connection->gateway_port, fwd->gateway_port, http->host); - return FALSE; - } - if (connection->forward_port != fwd->forward_port) - { - log_error(LOG_LEVEL_CONNECT, "Forward port mismatch: %d %d (%s)", - connection->forward_port, fwd->forward_port, http->host); - return FALSE; - } - if (connection->port != http->port) - { - log_error(LOG_LEVEL_CONNECT, "Server port mismatch: %d %d (%s)", - connection->port, http->port, http->host); - return FALSE; - } - - /* XXX: End of duplicated checks for debugging purposes. */ - if ((connection->forwarder_type != fwd->type) || (connection->gateway_port != fwd->gateway_port) || (connection->forward_port != fwd->forward_port) |