Browse code

raw socket: compilation fixes

Andrei Pelinescu-Onciul authored on 15/06/2010 14:24:46
Showing 2 changed files
... ...
@@ -26,18 +26,15 @@
26 26
 
27 27
 #ifdef USE_RAW_SOCKS
28 28
 
29
-#include "../../config.h"
30
-#include "../../receive.h"
31 29
 
32 30
 #include "raw_listener.h"
33 31
 #include "raw_sock.h"
34
-#include "tlb_send.h"
35
-#include "tlb_cfg.h"
32
+#include "receive.h"
36 33
 
37 34
 #include <errno.h>
38 35
 #include <string.h>
39 36
 
40
-struct raw_listen_info* raw_sendipv4=0;
37
+struct socket_info* raw_udp_sendipv4=0;
41 38
 
42 39
 /** creates a raw socket based on a socket_info structure.
43 40
  * Side-effects: sets raw_udp_sendipv4 if not already set.
... ...
@@ -55,7 +52,7 @@ int raw_listener_init(struct socket_info* si, str* iface, int iphdr_incl)
55 55
 	su2ip_addr(&ip, &si->su);
56 56
 	sock=raw_udp4_socket(&ip, iface, iphdr_incl);
57 57
 	if (sock>=0){
58
-		if (raw_sendipv4==0 || iface==0 || iface->s==0)
58
+		if (raw_udp_sendipv4==0 || iface==0 || iface->s==0)
59 59
 			raw_udp_sendipv4=si;
60 60
 	}
61 61
 	return sock;
... ...
@@ -27,11 +27,11 @@
27 27
 #ifndef _raw_listener_h
28 28
 #define _raw_listener_h
29 29
 
30
-#include "../../ip_addr.h"
30
+#include "ip_addr.h"
31 31
 
32 32
 
33 33
 /** default raw socket used for sending on udp ipv4 */
34
-struct struct_info* raw_udp_sendipv4;
34
+struct socket_info* raw_udp_sendipv4;
35 35
 
36 36
 int raw_listener_init(struct socket_info* si, str* iface, int iphdr_incl);
37 37
 int raw_udp4_rcv_loop(int rsock, int port1, int port2);