j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Be consistent.

Browse source
This commit is contained in:
Guus Sliepen 2003-07-21 13:14:02 +00:00
parent b657f05194
commit c1e8152f4f
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/dropin.c
View file

@ -17,11 +17,13 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: dropin.c,v 1.1.2.15 2003/07/17 15:06:25 guus Exp $
$Id: dropin.c,v 1.1.2.16 2003/07/21 13:14:02 guus Exp $
*/
#include "system.h"
#include "xalloc.h"
#ifndef HAVE_DAEMON
/*
Replacement for the daemon() function.

4
lib/fake-getaddrinfo.c
View file

@ -11,6 +11,8 @@
#include "system.h"
#include "ipv4.h"
#include "ipv6.h"
#include "fake-getaddrinfo.h"
#ifndef HAVE_GAI_STRERROR
@ -40,7 +42,7 @@ void freeaddrinfo(struct addrinfo *ai)
#endif /* !HAVE_FREEADDRINFO */
#ifndef HAVE_GETADDRINFO
static struct addrinfo *malloc_ai(int port, u_long addr)
static struct addrinfo *malloc_ai(int port, uint32_t addr)
{
struct addrinfo *ai;

12
lib/ipv4.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: ipv4.h,v 1.1.2.2 2003/07/18 13:42:35 guus Exp $
$Id: ipv4.h,v 1.1.2.3 2003/07/21 13:14:02 guus Exp $
*/
#ifndef __TINC_IPV4_H__
@ -57,16 +57,16 @@ struct ip {
unsigned int ip_hl:4;
#endif
uint8_t ip_tos;
u_short ip_len;
u_short ip_id;
u_short ip_off;
uint16_t ip_len;
uint16_t ip_id;
uint16_t ip_off;
#define IP_RF 0x8000
#define IP_DF 0x4000
#define IP_MF 0x2000
#define IP_OFFMASK 0x1fff
uint8_t ip_ttl;
uint8_t ip_p;
u_short ip_sum;
uint16_t ip_sum;
struct in_addr ip_src, ip_dst;
};
#endif
@ -77,7 +77,7 @@ struct icmp {
uint8_t icmp_code;
uint16_t icmp_cksum;
union {
u_char ih_pptr;
uint8_t ih_pptr;
struct in_addr ih_gwaddr;
struct ih_idseq {
uint16_t icd_id;

5
lib/ipv6.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: ipv6.h,v 1.1.2.5 2003/07/18 13:42:35 guus Exp $
$Id: ipv6.h,v 1.1.2.6 2003/07/21 13:14:02 guus Exp $
*/
#ifndef __TINC_IPV6_H__
@ -46,7 +46,8 @@ struct in6_addr {
#ifndef HAVE_STRUCT_SOCKADDR_IN6
struct sockaddr_in6 {
in_port_t sin6_port;
uint16_t sin6_family;
uint16_t sin6_port;
uint32_t sin6_flowinfo;
struct in6_addr sin6_addr;
uint32_t sin6_scope_id;