8a427df03d
Make gcc3 ignore built-in 'log' function. Make sure we pick up all -Defines in the Makefile.
43 lines
1.5 KiB
Text
43 lines
1.5 KiB
Text
$NetBSD: patch-an,v 1.2 2003/10/17 21:06:48 hfath Exp $
|
|
|
|
--- network.c.orig 2002-04-10 22:09:33.000000000 +0200
|
|
+++ network.c
|
|
@@ -14,9 +14,6 @@
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
-#include <sys/socket.h>
|
|
-#include <netinet/in.h>
|
|
-#include <arpa/inet.h>
|
|
#include <netdb.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
@@ -25,7 +22,6 @@
|
|
#include "l2tp.h"
|
|
|
|
char hostname[256];
|
|
-unsigned int listen_addy = INADDR_ANY; /* Address to listen on */
|
|
struct sockaddr_in server, from; /* Server and transmitter structs */
|
|
int server_socket; /* Server socket */
|
|
#ifdef USE_KERNEL
|
|
@@ -47,7 +43,7 @@ int init_network (void)
|
|
int length = sizeof (server);
|
|
gethostname (hostname, sizeof (hostname));
|
|
server.sin_family = AF_INET;
|
|
- server.sin_addr.s_addr = htonl (listen_addy);
|
|
+ server.sin_addr = gconfig.addr;
|
|
server.sin_port = htons (gconfig.port);
|
|
if ((server_socket = socket (PF_INET, SOCK_DGRAM, 0)) < 0)
|
|
{
|
|
@@ -364,8 +360,9 @@ void network_thread ()
|
|
extract (buf->start, &tunnel, &call);
|
|
if (debug_network)
|
|
{
|
|
- log (LOG_DEBUG, "%s: recv packet from %s, size = %d,
|
|
-tunnel = %d, call = %d\n", __FUNCTION__, inet_ntoa (from.sin_addr), recvsize, tunnel, call);
|
|
+ log (LOG_DEBUG, "%s: recv packet from %s, size = %d, "
|
|
+ "tunnel = %d, call = %d\n", __FUNCTION__,
|
|
+ inet_ntoa (from.sin_addr), recvsize, tunnel, call);
|
|
}
|
|
if (packet_dump)
|
|
{
|