===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/socks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/nc/socks.c	2003/06/03 20:49:29	1.7
--- src/usr.bin/nc/socks.c	2003/07/07 21:36:23	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: socks.c,v 1.7 2003/06/03 20:49:29 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: socks.c,v 1.8 2003/07/07 21:36:23 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
***************
*** 46,54 ****
  #define SOCKS_MAXCMDSZ	10
  
  int	remote_connect(char *, char *, struct addrinfo);
  
  static in_addr_t
! decode_addr (const char *s)
  {
  	struct hostent *hp = gethostbyname (s);
  	struct in_addr retval;
--- 46,57 ----
  #define SOCKS_MAXCMDSZ	10
  
  int	remote_connect(char *, char *, struct addrinfo);
+ int	socks_connect(char *host, char *port, struct addrinfo hints,
+ 	    char *proxyhost, char *proxyport, struct addrinfo proxyhints,
+ 	    int socksv);
  
  static in_addr_t
! decode_addr(const char *s)
  {
  	struct hostent *hp = gethostbyname (s);
  	struct in_addr retval;
***************
*** 61,67 ****
  }
  
  static in_port_t
! decode_port (const char *s)
  {
  	struct servent *sp;
  	in_port_t port;
--- 64,70 ----
  }
  
  static in_port_t
! decode_port(const char *s)
  {
  	struct servent *sp;
  	in_port_t port;
***************
*** 79,85 ****
  }
  
  int
! socks_connect (char *host, char *port, struct addrinfo hints,
      char *proxyhost, char *proxyport, struct addrinfo proxyhints,
      int socksv)
  {
--- 82,88 ----
  }
  
  int
! socks_connect(char *host, char *port, struct addrinfo hints,
      char *proxyhost, char *proxyport, struct addrinfo proxyhints,
      int socksv)
  {