Module: sip-router Branch: andrei/raw_sock Commit: d0df7adc45ad9f7a5b253e1f4390084259b97cd3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0df7adc...

Author: Andrei Pelinescu-Onciul andrei@iptel.org Committer: Andrei Pelinescu-Onciul andrei@iptel.org Date: Tue Jun 15 16:24:46 2010 +0200

raw socket: compilation fixes

---

raw_listener.c | 9 +++------ raw_listener.h | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/raw_listener.c b/raw_listener.c index ef707a2..5656a74 100644 --- a/raw_listener.c +++ b/raw_listener.c @@ -26,18 +26,15 @@

#ifdef USE_RAW_SOCKS

-#include "../../config.h" -#include "../../receive.h"

#include "raw_listener.h" #include "raw_sock.h" -#include "tlb_send.h" -#include "tlb_cfg.h" +#include "receive.h"

#include <errno.h> #include <string.h>

-struct raw_listen_info* raw_sendipv4=0; +struct socket_info* raw_udp_sendipv4=0;

/** creates a raw socket based on a socket_info structure. * 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) su2ip_addr(&ip, &si->su); sock=raw_udp4_socket(&ip, iface, iphdr_incl); if (sock>=0){ - if (raw_sendipv4==0 || iface==0 || iface->s==0) + if (raw_udp_sendipv4==0 || iface==0 || iface->s==0) raw_udp_sendipv4=si; } return sock; diff --git a/raw_listener.h b/raw_listener.h index 5bc2f58..3ac7d84 100644 --- a/raw_listener.h +++ b/raw_listener.h @@ -27,11 +27,11 @@ #ifndef _raw_listener_h #define _raw_listener_h

-#include "../../ip_addr.h" +#include "ip_addr.h"

/** default raw socket used for sending on udp ipv4 */ -struct struct_info* raw_udp_sendipv4; +struct socket_info* raw_udp_sendipv4;

int raw_listener_init(struct socket_info* si, str* iface, int iphdr_incl); int raw_udp4_rcv_loop(int rsock, int port1, int port2);