[Javanetsim-cvs] IceScan/icesockets crawsocket.h, 1.7, 1.8 sock_arp.h, 1.2, 1.3 sock_name.h, 1.8, 1
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] IceScan/icesockets crawsocket.h, 1.7, 1.8 sock_arp.h, 1.2, 1.3 sock_name.h, 1.8, 1.9 iceregex.h, 1.8, 1.9 sock_types.h, 1.7, 1.8 sock_time.h, 1.2, 1.3 csocket.h, 1.11, 1.12 sock_err.h, 1.1, 1.2
|
From: Alexander B. <da...@us...> - 2006-12-15 15:28:04
|
Update of /cvsroot/javanetsim/IceScan/icesockets In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10002/icesockets Modified Files: crawsocket.h sock_arp.h sock_name.h iceregex.h sock_types.h sock_time.h csocket.h sock_err.h Log Message: no message Index: sock_arp.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_arp.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sock_arp.h 14 Dec 2006 19:45:40 -0000 1.2 --- sock_arp.h 15 Dec 2006 15:27:57 -0000 1.3 *************** *** 11,23 **** #include "sock_types.h" - #include <stdlib.h> - #include <stdio.h> - #include <net/if_arp.h> - #include <sys/ioctl.h> - #include <netinet/in.h> - #include <arpa/inet.h> - icestring get_arp_from_cache(icestring &ip) { struct sockaddr_in sin = { 0 }; struct arpreq myarp = { { 0 } }; --- 11,19 ---- #include "sock_types.h" icestring get_arp_from_cache(icestring &ip) { + #ifdef __CYGWIN__ + return ""; + #else struct sockaddr_in sin = { 0 }; struct arpreq myarp = { { 0 } }; *************** *** 52,56 **** return ret; ! } --- 48,52 ---- return ret; ! #endif } Index: sock_types.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_types.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sock_types.h 14 Dec 2006 13:42:06 -0000 1.7 --- sock_types.h 15 Dec 2006 15:27:57 -0000 1.8 *************** *** 2,14 **** --- 2,33 ---- #define ICESOCK_SOCK_TYPES_H + #include <vector> #include <string> #include <iostream> //for std + #include <sys/types.h> + + #include <time.h> + #include <sys/timeb.h> + + #include <errno.h> + #include <sys/socket.h> #include <arpa/inet.h> + #include <net/if_arp.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netdb.h> + #include <cstdio> + #include <cstdlib> + + #include <fcntl.h> + #include <sys/ioctl.h> + + #include <netinet/ip.h> + #include <netinet/ip_icmp.h> + #define __FAVOR_BSD + #include <netinet/tcp.h> #define my_uint16_t uint16_t *************** *** 16,19 **** --- 35,46 ---- #define my_uint8_t uint8_t + struct pseudo_header { + my_uint32_t s_addr; + my_uint32_t d_addr; + my_uint8_t zero; + my_uint8_t protocol; + my_uint16_t length; + }; + // Re-Defining string type; use icestring instead of string #ifdef __CYGWIN__ *************** *** 28,33 **** #include <sys/param.h> #include <sys/file.h> - #include <netdb.h> - #include <netinet/in.h> #include <netinet/in_systm.h> --- 55,58 ---- Index: sock_name.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_name.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** sock_name.h 13 Dec 2006 20:06:32 -0000 1.8 --- sock_name.h 15 Dec 2006 15:27:57 -0000 1.9 *************** *** 10,24 **** #endif - #include <stdio.h> - #include <stdlib.h> - #include <errno.h> - #include <netdb.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> - #include <iostream> - #include <vector> #include "iceregex.h" --- 10,15 ---- #endif + #include "sock_types.h" #include "iceregex.h" Index: sock_time.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_time.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sock_time.h 30 Nov 2006 06:43:50 -0000 1.2 --- sock_time.h 15 Dec 2006 15:27:57 -0000 1.3 *************** *** 2,7 **** #define ICESOCK_SOCK_TIME_H ! #include <time.h> ! #include <sys/timeb.h> void icesleep(int secs, int nsecs){ --- 2,6 ---- #define ICESOCK_SOCK_TIME_H ! #include "sock_types.h" void icesleep(int secs, int nsecs){ Index: crawsocket.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icesockets/crawsocket.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** crawsocket.h 14 Dec 2006 05:21:41 -0000 1.7 --- crawsocket.h 15 Dec 2006 15:27:57 -0000 1.8 *************** *** 4,20 **** #include "csocket.h" - #include <netinet/ip.h> - #include <netinet/ip_icmp.h> - #define __FAVOR_BSD - #include <netinet/tcp.h> - - struct pseudo_header { - my_uint32_t s_addr; - my_uint32_t d_addr; - my_uint8_t zero; - my_uint8_t protocol; - my_uint16_t length; - }; - class crawsocket : csocket{ protected: --- 4,7 ---- Index: csocket.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icesockets/csocket.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** csocket.h 14 Dec 2006 19:23:32 -0000 1.11 --- csocket.h 15 Dec 2006 15:27:57 -0000 1.12 *************** *** 2,14 **** #define CSOCKET_H - #include <iostream> - - #include <cstdio> - #include <cstdlib> - #include <fcntl.h> - // Library - #include "sock_err.h" #include "sock_types.h" #include "sock_name.h" #include "sock_time.h" --- 2,8 ---- #define CSOCKET_H // Library #include "sock_types.h" + #include "sock_err.h" #include "sock_name.h" #include "sock_time.h" Index: sock_err.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_err.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sock_err.h 28 Nov 2006 17:57:54 -0000 1.1 --- sock_err.h 15 Dec 2006 15:27:57 -0000 1.2 *************** *** 2,6 **** #define ICESOCK_ERR_H ! #include <errno.h> #define ICESOCK_TIMEOUT 10 // timeout in when connecting or recieving --- 2,6 ---- #define ICESOCK_ERR_H ! #include "sock_types.h" #define ICESOCK_TIMEOUT 10 // timeout in when connecting or recieving *************** *** 14,16 **** --- 14,18 ---- #define err_print(error, quiet) if(!quiet) perror(error); + #define DBGOUTPUT(TEXT) std::cout << __FILE__ << " " << __LINE__ << ": " << TEXT << std::endl + #endif Index: iceregex.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icesockets/iceregex.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** iceregex.h 13 Dec 2006 22:40:30 -0000 1.8 --- iceregex.h 15 Dec 2006 15:27:57 -0000 1.9 *************** *** 9,19 **** #define _ICEREGEX_H - #include <string> - #include <vector> - #include <pcre.h> #include "sock_types.h" - #include "../icedebug.h" class IceRegex { --- 9,15 ---- |
