Commit a15b6a6f authored by Yang Tse's avatar Yang Tse
Browse files

the IP address we want/request/use from the interface is the 'local' 

address, the one on the box libcurl is running, not the 'remote' one.
parent 20d3e2b9

lib/config-riscos.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -378,9 +378,6 @@ 
/* Define to `int' if <sys/types.h> does not define. */

/* Define to `int' if <sys/types.h> does not define. */

#undef ssize_t

#undef ssize_t





/* this is a quick hack.  I hope it's correct. */

#define ifr_dstaddr ifr_addr



/* Define if you have the ioctl function. */

/* Define if you have the ioctl function. */

#define HAVE_IOCTL

#define HAVE_IOCTL

lib/if2ip.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -137,7 +137,7 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) 
    else {

    else {

      struct in_addr in;

      struct in_addr in;





      struct sockaddr_in *s = (struct sockaddr_in *)&req.ifr_dstaddr;

      struct sockaddr_in *s = (struct sockaddr_in *)&req.ifr_addr;

      memcpy(&in, &s->sin_addr, sizeof(in));

      memcpy(&in, &s->sin_addr, sizeof(in));

      ip = (char *) Curl_inet_ntop(s->sin_family, &in, buf, buf_size);

      ip = (char *) Curl_inet_ntop(s->sin_family, &in, buf, buf_size);

    }

    }

lib/if2ip.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,6 @@ struct ifreq { 




/* This define was added by Daniel to avoid an extra #ifdef INTERIX in the

/* This define was added by Daniel to avoid an extra #ifdef INTERIX in the

   C code. */

   C code. */

#define ifr_dstaddr ifr_addr





#define ifr_name ifr_ifrn.ifrn_name /* interface name */

#define ifr_name ifr_ifrn.ifrn_name /* interface name */

#define ifr_addr ifr_ifru.ifru_addr /* address */

#define ifr_addr ifr_ifru.ifru_addr /* address */

lib/setup-os400.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -30,9 +30,6 @@ 
/* OS/400 netdb.h does not define NI_MAXSERV. */

/* OS/400 netdb.h does not define NI_MAXSERV. */

#define NI_MAXSERV      32

#define NI_MAXSERV      32





/* OS/400 does not define the ifr_dstaddr union member. */

#define ifr_dstaddr     ifr_addr



/* No OS/400 header file defines u_int32_t. */

/* No OS/400 header file defines u_int32_t. */

typedef unsigned long   u_int32_t;

typedef unsigned long   u_int32_t;

src/config-riscos.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -369,9 +369,6 @@ 
/* Define to `int' if <sys/types.h> does not define. */

/* Define to `int' if <sys/types.h> does not define. */

#undef ssize_t

#undef ssize_t





/* this is a quick hack.  I hope it's correct. */

#define ifr_dstaddr ifr_addr



/* Define if you have the ioctl function. */

/* Define if you have the ioctl function. */

#define HAVE_IOCTL

#define HAVE_IOCTL