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

K&R style braces.

Browse source 
This is essentially commit f02d3ed3e1 from the
1.1 branch, making it easier to merge between master and 1.1.
This commit is contained in:
Guus Sliepen 2009-09-25 00:14:03 +02:00
parent ab7c61b06f
commit 5dde6461a3
32 changed files with 271 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/netutl.c
View file

@ -32,8 +32,7 @@ bool hostnames = false;
Turn a string into a struct addrinfo.
Return NULL on failure.
*/
struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype)
{
struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) {
struct addrinfo *ai, hint = {0};
int err;
@ -53,8 +52,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
return ai;
}
sockaddr_t str2sockaddr(const char *address, const char *port)
{
sockaddr_t str2sockaddr(const char *address, const char *port) {
struct addrinfo *ai, hint = {0};
sockaddr_t result;
int err;
@ -82,8 +80,7 @@ sockaddr_t str2sockaddr(const char *address, const char *port)
return result;
}
void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr)
{
void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
char address[NI_MAXHOST];
char port[NI_MAXSERV];
char *scopeid;
@ -116,8 +113,7 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr)
*portstr = xstrdup(port);
}
char *sockaddr2hostname(const sockaddr_t *sa)
{
char *sockaddr2hostname(const sockaddr_t *sa) {
char *str;
char address[NI_MAXHOST] = "unknown";
char port[NI_MAXSERV] = "unknown";
@ -142,8 +138,7 @@ char *sockaddr2hostname(const sockaddr_t *sa)
return str;
}
int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b)
{
int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
int result;
cp();
@ -175,8 +170,7 @@ int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b)
}
}
int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
{
int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
int result;
cp();
@ -244,8 +238,7 @@ void sockaddrfree(sockaddr_t *a) {
}
}
void sockaddrunmap(sockaddr_t *sa)
{
void sockaddrunmap(sockaddr_t *sa) {
cp();
if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) {
@ -256,8 +249,7 @@ void sockaddrunmap(sockaddr_t *sa)
/* Subnet mask handling */
int maskcmp(const void *va, const void *vb, int masklen)
{
int maskcmp(const void *va, const void *vb, int masklen) {
int i, m, result;
const char *a = va;
const char *b = vb;
@ -277,8 +269,7 @@ int maskcmp(const void *va, const void *vb, int masklen)
return 0;
}
void mask(void *va, int masklen, int len)
{
void mask(void *va, int masklen, int len) {
int i;
char *a = va;
@ -294,8 +285,7 @@ void mask(void *va, int masklen, int len)
a[i] = 0;
}
void maskcpy(void *va, const void *vb, int masklen, int len)
{
void maskcpy(void *va, const void *vb, int masklen, int len) {
int i, m;
char *a = va;
const char *b = vb;
@ -314,8 +304,7 @@ void maskcpy(void *va, const void *vb, int masklen, int len)
a[i] = 0;
}
bool maskcheck(const void *va, int masklen, int len)
{
bool maskcheck(const void *va, int masklen, int len) {
int i;
const char *a = va;