head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.4
	OPENPKG_E1_MP:1.4
	OPENPKG_E1_MP_2_STABLE:1.4
	OPENPKG_E1_FP:1.4
	OPENPKG_2_STABLE_MP:1.4
	OPENPKG_2_STABLE_20061018:1.4
	OPENPKG_2_STABLE_20060622:1.4
	OPENPKG_2_STABLE:1.4.0.14
	OPENPKG_2_STABLE_BP:1.4
	OPENPKG_2_5_RELEASE:1.4
	OPENPKG_2_5_SOLID:1.4.0.12
	OPENPKG_2_5_SOLID_BP:1.4
	OPENPKG_2_4_RELEASE:1.4
	OPENPKG_2_4_SOLID:1.4.0.10
	OPENPKG_2_4_SOLID_BP:1.4
	OPENPKG_CW_FP:1.4
	OPENPKG_2_3_RELEASE:1.4
	OPENPKG_2_3_SOLID:1.4.0.8
	OPENPKG_2_3_SOLID_BP:1.4
	OPENPKG_2_2_RELEASE:1.4
	OPENPKG_2_2_SOLID:1.4.0.6
	OPENPKG_2_2_SOLID_BP:1.4
	OPENPKG_2_1_RELEASE:1.4
	OPENPKG_2_1_SOLID:1.4.0.4
	OPENPKG_2_1_SOLID_BP:1.4
	OPENPKG_2_0_RELEASE:1.4
	OPENPKG_2_0_SOLID:1.4.0.2
	OPENPKG_2_0_SOLID_BP:1.4
	OPENPKG_1_3_RELEASE:1.1.4.1
	OPENPKG_1_3_SOLID:1.1.4.1.0.2
	OPENPKG_1_3_SOLID_BP:1.1.4.1
	OPENPKG_1_STABLE_MP:1.2
	OPENPKG_1_2_RELEASE:1.1
	OPENPKG_1_2_SOLID:1.1.0.6
	OPENPKG_1_2_SOLID_BP:1.1
	OPENPKG_1_STABLE:1.1.0.4
	OPENPKG_1_STABLE_BP:1.1
	OPENPKG_1_1_RELEASE:1.1
	OPENPKG_1_1_SOLID:1.1.0.2
	OPENPKG_1_1_SOLID_BP:1.1;
locks; strict;
comment	@# @;


1.4
date	2003.11.26.10.47.10;	author thl;	state Exp;
branches;
next	1.3;

1.3
date	2003.11.26.10.46.33;	author thl;	state Exp;
branches;
next	1.2;

1.2
date	2003.07.21.08.51.41;	author mlelstv;	state Exp;
branches;
next	1.1;

1.1
date	2002.08.20.14.59.14;	author rse;	state Exp;
branches
	1.1.4.1;
next	;

1.1.4.1
date	2003.07.24.20.44.23;	author rse;	state Exp;
branches;
next	;


desc
@@


1.4
log
@upgrading package: libnet 1.1.0 -> 1.1.1
@
text
@--- src/libnet_resolve.c.orig	2003-11-26 11:36:43.000000000 +0100
+++ src/libnet_resolve.c	2003-11-26 11:36:43.000000000 +0100
@@@@ -210,7 +210,11 @@@@
     if (!host_ent)
     {
 #if !defined(__WIN32__) /* Silence Win32 warning */
+#ifdef AF_INET6
         inet_ntop(AF_INET6, &addr, host_name, host_name_len);
+#else
+        host_name[0] = '\0';
+#endif /* AF_INET6 */
 #endif
     }
     else
@@@@ -272,7 +276,11 @@@@
         }
         return (in6addr_error);
         #else
+#ifdef AF_INET6
         if(!inet_pton(AF_INET6, host_name, &addr))
+#else
+        if(1)
+#endif /* AF_INET6 */
         {
             if (l)
             {
@


1.3
log
@patch can be removed for all supported platforms but will be revamped for Solaris 2.6
@
text
@d1 26
@


1.2
log
@fix build for systems without INET6
@
text
@a0 64
--- src/libnet_resolve.c.dist	2003-07-21 10:38:32.000000000 +0200
+++ src/libnet_resolve.c	2003-07-21 10:41:21.000000000 +0200
@@@@ -185,8 +185,10 @@@@
 
     if (use_name == LIBNET_RESOLVE)
     {    
+#ifdef AF_INET6
         host_ent = gethostbyaddr((char *)&addr, sizeof(struct in_addr),
                 AF_INET6);
+#endif
     }
     if (!host_ent)
     {
@@@@ -218,7 +220,15 @@@@
    
     if (use_name == LIBNET_RESOLVE)
     {
+#if defined AF_INET6
+#if defined(__FreeBSD__) || defined(__linux__)
         if (!(host_ent = gethostbyname2(host_name, AF_INET6)))
+#else
+        if (!(host_ent = gethostbyname(host_name)) || host_ent->h_addrtype != AF_INET6)
+#endif
+#else
+        if (0)
+#endif
         {
             snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
                     "libnet_name2addr6(): %s", strerror(errno));
--- src/libnet_raw.c.dist	2003-07-21 10:38:37.000000000 +0200
+++ src/libnet_raw.c	2003-07-21 10:41:55.000000000 +0200
@@@@ -122,8 +122,12 @@@@
         return (-1);
     } 
 
+#ifdef PF_INET6
     l->fd = socket(PF_INET6, SOCK_RAW, l->protocol);
     if (l->fd == -1)
+#else
+    if (0)
+#endif
     {
         snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, 
                 "libnet_open_raw6(): SOCK_RAW allocation failed: %s\n",
--- src/libnet_write.c.dist	2003-07-21 10:38:44.000000000 +0200
+++ src/libnet_write.c	2003-07-21 10:47:09.000000000 +0200
@@@@ -194,6 +194,7 @@@@
 int
 libnet_write_raw_ipv6(libnet_t *l, u_char *packet, u_long size)
 {
+#ifdef AF_INET6
     int c;
     struct sockaddr_in6 sin;
     struct libnet_ipv6_hdr *ip_hdr;
@@@@ -224,6 +225,9 @@@@
 #endif
     }
     return (c);
+#else
+    return (-1);
+#endif
 }
 
 /* EOF */
@


1.1
log
@fix it the 'better' way...
@
text
@d1 14
a14 3
--- src/libnet_resolve.c.orig	Tue Aug 20 16:56:01 2002
+++ src/libnet_resolve.c	Tue Aug 20 16:56:01 2002
@@@@ -218,7 +218,11 @@@@
d18 1
d24 3
d30 35
@


1.1.4.1
log
@mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only]
@
text
@d1 3
a3 14
--- src/libnet_resolve.c.dist	2003-07-21 10:38:32.000000000 +0200
+++ src/libnet_resolve.c	2003-07-21 10:41:21.000000000 +0200
@@@@ -185,8 +185,10 @@@@
 
     if (use_name == LIBNET_RESOLVE)
     {    
+#ifdef AF_INET6
         host_ent = gethostbyaddr((char *)&addr, sizeof(struct in_addr),
                 AF_INET6);
+#endif
     }
     if (!host_ent)
     {
@@@@ -218,7 +220,15 @@@@
a6 1
+#if defined AF_INET6
a11 3
+#else
+        if (0)
+#endif
a14 35
--- src/libnet_raw.c.dist	2003-07-21 10:38:37.000000000 +0200
+++ src/libnet_raw.c	2003-07-21 10:41:55.000000000 +0200
@@@@ -122,8 +122,12 @@@@
         return (-1);
     } 
 
+#ifdef PF_INET6
     l->fd = socket(PF_INET6, SOCK_RAW, l->protocol);
     if (l->fd == -1)
+#else
+    if (0)
+#endif
     {
         snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, 
                 "libnet_open_raw6(): SOCK_RAW allocation failed: %s\n",
--- src/libnet_write.c.dist	2003-07-21 10:38:44.000000000 +0200
+++ src/libnet_write.c	2003-07-21 10:47:09.000000000 +0200
@@@@ -194,6 +194,7 @@@@
 int
 libnet_write_raw_ipv6(libnet_t *l, u_char *packet, u_long size)
 {
+#ifdef AF_INET6
     int c;
     struct sockaddr_in6 sin;
     struct libnet_ipv6_hdr *ip_hdr;
@@@@ -224,6 +225,9 @@@@
 #endif
     }
     return (c);
+#else
+    return (-1);
+#endif
 }
 
 /* EOF */
@