projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psyc/social: local join flag; social service: leave place, save _file
[oweals/gnunet.git]
/
src
/
nat
/
gnunet-helper-nat-server.c
diff --git
a/src/nat/gnunet-helper-nat-server.c
b/src/nat/gnunet-helper-nat-server.c
index b0bdbf0099e2bc7efe4a9f9615baa066cede6fa6..95b46fd6c8f23199feb1e3f6de34f24aafa46da0 100644
(file)
--- a/
src/nat/gnunet-helper-nat-server.c
+++ b/
src/nat/gnunet-helper-nat-server.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2010 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2010 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-463,7
+463,9
@@
make_udp_socket (const struct in_addr *my_ip)
ret = socket (AF_INET, SOCK_DGRAM, 0);
if (-1 == ret)
{
ret = socket (AF_INET, SOCK_DGRAM, 0);
if (-1 == ret)
{
- fprintf (stderr, "Error opening UDP socket: %s\n", strerror (errno));
+ fprintf (stderr,
+ "Error opening UDP socket: %s\n",
+ strerror (errno));
return -1;
}
memset (&addr, 0, sizeof (addr));
return -1;
}
memset (&addr, 0, sizeof (addr));
@@
-474,9
+476,13
@@
make_udp_socket (const struct in_addr *my_ip)
addr.sin_addr = *my_ip;
addr.sin_port = htons (NAT_TRAV_PORT);
addr.sin_addr = *my_ip;
addr.sin_port = htons (NAT_TRAV_PORT);
- if (0 != bind (ret, &addr, sizeof (addr)))
+ if (0 != bind (ret,
+ (struct sockaddr *) &addr,
+ sizeof (addr)))
{
{
- fprintf (stderr, "Error binding UDP socket to port %u: %s\n", NAT_TRAV_PORT,
+ fprintf (stderr,
+ "Error binding UDP socket to port %u: %s\n",
+ NAT_TRAV_PORT,
strerror (errno));
(void) close (ret);
return -1;
strerror (errno));
(void) close (ret);
return -1;