X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=df43197940ad51bcbeda9e55b26ef8122e64bab1;hp=1100071a5c012ba4d595d4e6c1970e74be0b7df1;hb=2ac7be0d51a112108dc6c2b1c6f46da022f72f40;hpb=c2b9c06062d36bde859b630b99a08c7b7428e721 diff --git a/src/net.h b/src/net.h index 1100071a..df431979 100644 --- a/src/net.h +++ b/src/net.h @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.h,v 1.9.4.39 2002/02/18 16:25:16 guus Exp $ + $Id: net.h,v 1.9.4.42 2002/02/26 22:47:51 guus Exp $ */ #ifndef __TINC_NET_H__ @@ -65,7 +65,11 @@ typedef union { struct sockaddr_in6 in6; } sockaddr_t; -#define SA_PORT(s) ((s.sa.sa_family==AF_INET)?s.in.sin_port:(s.sa.sa_family==AF_INET6)?s.in6.sin6_port:0) +#ifdef SA_LEN +#define SALEN(s) SA_LEN(&s) +#else +#define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6)) +#endif typedef struct vpn_packet_t { length_t len; /* the actual number of bytes in the `data' field */