[Javanetsim-cvs] IceScan/icesockets crawsocket.h, 1.17, 1.18 sock_eth.h, 1.3, 1.4 sock_win.h, 1.7, 1.8

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

Update of /cvsroot/javanetsim/IceScan/icesockets
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21412/icesockets

Modified Files:
	crawsocket.h sock_eth.h sock_win.h 
Log Message:


Index: crawsocket.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/crawsocket.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** crawsocket.h	17 Dec 2006 15:06:37 -0000	1.17
--- crawsocket.h	17 Dec 2006 15:51:54 -0000	1.18
***************
*** 203,214 ****
                  perror("sendto in send_tcp_raw");
  		#ifdef WIN32
!                     free(packet);
!                 #endif
                  return -1;
          }
  
!         
! 
! 	#ifdef WIN32
                  free(packet);
          #endif
--- 203,213 ----
                  perror("sendto in send_tcp_raw");
  		#ifdef WIN32
!                 free(packet);
!         #endif
                  return -1;
          }
+       
  
! 		#ifdef WIN32
                  free(packet);
          #endif

Index: sock_eth.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_eth.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sock_eth.h	17 Dec 2006 15:14:51 -0000	1.3
--- sock_eth.h	17 Dec 2006 15:51:54 -0000	1.4
***************
*** 2,6 ****
  #define	_iceeth_H
  
! #ifdef __WIN32__
  	#include "sock_types.h"
  
--- 2,6 ----
  #define	_iceeth_H
  
! /*#ifdef WIN3
  	#include "sock_types.h"
  
***************
*** 13,18 ****
                  
  		return 0;
! 	}
! #elif __CYGWIN__        
          int send_ip_packet(const void *buf, size_t len){
  
--- 13,18 ----
                  
  		return 0;
! 	}*/
! #ifdef __CYGWIN__        
          int send_ip_packet(const void *buf, size_t len){
  
***************
*** 23,27 ****
  
  #include "queue.h"
! #include <dnet.h>
          
  struct ip_intf {
--- 23,27 ----
  
  #include "queue.h"
! //#include <dnet.h>
          
  struct ip_intf {
***************
*** 186,191 ****
  	if (len > ipi->mtu) {
  		u_char *p, *start, *end, *ip_data;
  		int ip_hl, fraglen;
! 		
  		ip_hl = iph->ip_hl << 2;
  		fraglen = ipi->mtu - ip_hl;
--- 186,192 ----
  	if (len > ipi->mtu) {
  		u_char *p, *start, *end, *ip_data;
+ 	#undef ip_hl
  		int ip_hl, fraglen;
! 
  		ip_hl = iph->ip_hl << 2;
  		fraglen = ipi->mtu - ip_hl;
***************
*** 221,224 ****
--- 222,227 ----
  		return (-1);
  	
+ 	#define ip_hl       ip_hv&0x0f
+ 	
  	return (len);
  }
***************
*** 238,242 ****
--- 241,249 ----
  		}
  		if (ip->fd >= 0)
+ #ifdef WIN32
+ 			closesocket(ip->fd);
+ #else
  			close(ip->fd);
+ #endif
  		if (ip->route != NULL)
  			route_close(ip->route);
***************
*** 253,257 ****
  		ip_t *i = i_ip_open();
  
!         	i_ip_send(i, buf, len);
                  
  		i_ip_close(i);
--- 260,264 ----
  		ip_t *i = i_ip_open();
  
!         i_ip_send(i, buf, len);
                  
  		i_ip_close(i);

Index: sock_win.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_win.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sock_win.h	17 Dec 2006 15:06:37 -0000	1.7
--- sock_win.h	17 Dec 2006 15:51:54 -0000	1.8
***************
*** 20,24 ****
  	#pragma comment(lib, "wpcap.lib")
  	#pragma comment(lib, "packet.lib")
! 	#pragma comment(lib, "libdnet-stripped.lib")
  	#pragma comment(lib, "iphlpapi.lib")
  #ifndef __NO_LIBPCRE__
--- 20,24 ----
  	#pragma comment(lib, "wpcap.lib")
  	#pragma comment(lib, "packet.lib")
! 	#pragma comment(lib, "dnet.lib") //libdnet-stripped
  	#pragma comment(lib, "iphlpapi.lib")
  #ifndef __NO_LIBPCRE__