[Icescan-cvs] IceScan/icesockets sock_types.h,1.14,1.15

[Alexander B. <da...@us...>]

Update of /cvsroot/icescan/IceScan/icesockets
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23528/icesockets

Modified Files:
	sock_types.h 
Log Message:
Update TODO/ChangeLog; fixed some UI issues.

Index: sock_types.h
===================================================================
RCS file: /cvsroot/icescan/IceScan/icesockets/sock_types.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** sock_types.h	23 Jan 2007 12:51:53 -0000	1.14
--- sock_types.h	27 Jan 2007 11:01:31 -0000	1.15
***************
*** 46,78 ****
      #define TRAILING_SLASH '\\'
  #else	
  
! 	#ifndef __CYGWIN__
! 		#include <netinet/if_ether.h>
! 	#endif
! 
! 	#include <sys/socket.h>
! 	#include <arpa/inet.h>
  
! 	#ifndef __CYGWIN__
! 		#include <net/if_arp.h>
! 	#endif
  
! 	#include <netinet/in.h>
! 	#include <netinet/ip.h>
! 	#include <netdb.h>
  
! 	#include <sys/ioctl.h>
  
! 	#include <netinet/ip.h>
! 	#include <netinet/ip_icmp.h>
! 	#define __FAVOR_BSD	
! 	#include <netinet/tcp.h>
! 	#undef __FAVOR_BSD	
! 	#ifndef __CYGWIN__
! 		#undef __FAVOR_BSD	
! 		#include <netinet/udp.h>
! 	#endif
  
! 	#include <pthread.h>
  #endif
  
--- 46,77 ----
      #define TRAILING_SLASH '\\'
  #else	
+     #ifndef __CYGWIN__
+             #include <netinet/if_ether.h>
+     #endif
  
!     #include <sys/socket.h>
!     #include <arpa/inet.h>
  
!     #ifndef __CYGWIN__
!             #include <net/if_arp.h>
!     #endif
  
!     #include <netinet/in.h>
!     #include <netinet/ip.h>
!     #include <netdb.h>
  
!     #include <sys/ioctl.h>
  
!     #include <netinet/ip.h>
!     #include <netinet/ip_icmp.h>
!     #define __FAVOR_BSD	
!     #include <netinet/tcp.h>
!     #undef __FAVOR_BSD	
!     #ifndef __CYGWIN__
!             #undef __FAVOR_BSD	
!             #include <netinet/udp.h>
!     #endif
  
!     #include <pthread.h>
  #endif
  
***************
*** 417,444 ****
      };
      
- //    struct ip
- //    {
- //    #if __BYTE_ORDER == __LITTLE_ENDIAN
- //	unsigned int ip_hl:4;		/* header length */
- //	unsigned int ip_v:4;		/* version */
- //    #endif
- //    #if __BYTE_ORDER == __BIG_ENDIAN
- //	unsigned int ip_v:4;		/* version */
- //	unsigned int ip_hl:4;		/* header length */
- //    #endif
- //	u8 ip_tos;			/* type of service */
- //	u_short ip_len;			/* total length */
- //	u_short ip_id;			/* identification */
- //	u_short ip_off;			/* fragment offset field */
- //	#define	IP_RF 0x8000			/* reserved fragment flag */
- //	#define	IP_DF 0x4000			/* dont fragment flag */
- //	#define	IP_MF 0x2000			/* more fragments flag */
- //	#define	IP_OFFMASK 0x1fff		/* mask for fragmenting bits */
- //	u8 ip_ttl;			/* time to live */
- //	u8 ip_p;			/* protocol */
- //	u_short ip_sum;			/* checksum */
- //	struct in_addr ip_src, ip_dst;	/* source and dest address */
- //    };
-     
      /* ARP ioctl request.  */
      struct arpreq
--- 416,419 ----