lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[style] mass reformat all the non external code to 4 space indents

Browse Source 
Ran everything through scripts/codestyle.space, which uses astyle
to generally follow K&R style.

Biggest non whitespace change is pulling brackets down on function
declarations, which I'm pretty ambivalent about, but astyle insists
on taking a stance
This commit is contained in:
Travis Geiselbrecht
2016-02-14 12:24:01 -08:00
parent 6659d28a4f
commit 2eb32a4369
276 changed files with 11152 additions and 10886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
tools/network.c
View File

@@ -28,95 +28,102 @@
#include "network.h"
in_addr_t lookup_hostname(const char *hostname) {
int err;
struct addrinfo *info, *temp;
in_addr_t addr = 0;
in_addr_t lookup_hostname(const char *hostname)
{
int err;
struct addrinfo *info, *temp;
in_addr_t addr = 0;
struct addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;
struct addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;
err = getaddrinfo(hostname, NULL, &hints, &info);
if (err < 0) {
printf("getaddrinfo() returns %d, error '%s'\n", err, gai_strerror(err));
return 0;
}
err = getaddrinfo(hostname, NULL, &hints, &info);
if (err < 0) {
printf("getaddrinfo() returns %d, error '%s'\n", err, gai_strerror(err));
return 0;
}
for (temp = info; temp; temp = temp->ai_next) {
// printf("flags 0x%x, family %d, socktype %d, protocol %d, addrlen %d\n",
// temp->ai_flags, temp->ai_family, temp->ai_socktype, temp->ai_protocol, temp->ai_addrlen);
for (temp = info; temp; temp = temp->ai_next) {
// printf("flags 0x%x, family %d, socktype %d, protocol %d, addrlen %d\n",
// temp->ai_flags, temp->ai_family, temp->ai_socktype, temp->ai_protocol, temp->ai_addrlen);
if (temp->ai_family == AF_INET && temp->ai_protocol == IPPROTO_TCP) {
struct sockaddr_in *sa = (struct sockaddr_in *)temp->ai_addr;
// printf("port %d, addr 0x%x\n", sa->sin_port, sa->sin_addr.s_addr);
addr = sa->sin_addr.s_addr;
}
}
if (temp->ai_family == AF_INET && temp->ai_protocol == IPPROTO_TCP) {
struct sockaddr_in *sa = (struct sockaddr_in *)temp->ai_addr;
// printf("port %d, addr 0x%x\n", sa->sin_port, sa->sin_addr.s_addr);
addr = sa->sin_addr.s_addr;
}
}
freeaddrinfo(info);
freeaddrinfo(info);
return addr;
return addr;
}
static int inet_listen(in_addr_t addr, int type, unsigned port, int shared) {
struct sockaddr_in sa;
int s;
if ((s = socket(AF_INET, type, 0)) < 0) {
return -1;
}
if (shared) {
int opt = 1;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
//setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt));
}
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
sa.sin_port = htons(port);
sa.sin_addr.s_addr = addr;
if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
close(s);
return -1;
}
return s;
static int inet_listen(in_addr_t addr, int type, unsigned port, int shared)
{
struct sockaddr_in sa;
int s;
if ((s = socket(AF_INET, type, 0)) < 0) {
return -1;
}
if (shared) {
int opt = 1;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
//setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt));
}
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
sa.sin_port = htons(port);
sa.sin_addr.s_addr = addr;
if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
close(s);
return -1;
}
return s;
}
static int inet_connect(in_addr_t addr, int type, unsigned port) {
struct sockaddr_in sa;
int s;
if ((s = socket(AF_INET, type, 0)) < 0) {
return -1;
}
if (addr == 0xFFFFFFFF) {
int opt = 1;
setsockopt(s, SOL_SOCKET, SO_BROADCAST, &opt, sizeof(opt));
}
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
sa.sin_port = htons(port);
sa.sin_addr.s_addr = addr;
if (connect(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
close(s);
return -1;
}
return s;
static int inet_connect(in_addr_t addr, int type, unsigned port)
{
struct sockaddr_in sa;
int s;
if ((s = socket(AF_INET, type, 0)) < 0) {
return -1;
}
if (addr == 0xFFFFFFFF) {
int opt = 1;
setsockopt(s, SOL_SOCKET, SO_BROADCAST, &opt, sizeof(opt));
}
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
sa.sin_port = htons(port);
sa.sin_addr.s_addr = addr;
if (connect(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
close(s);
return -1;
}
return s;
}
int udp_listen(in_addr_t addr, unsigned port, int shared) {
return inet_listen(addr, SOCK_DGRAM, port, shared);
int udp_listen(in_addr_t addr, unsigned port, int shared)
{
return inet_listen(addr, SOCK_DGRAM, port, shared);
}
int udp_connect(in_addr_t addr, unsigned port) {
return inet_connect(addr, SOCK_DGRAM, port);
int udp_connect(in_addr_t addr, unsigned port)
{
return inet_connect(addr, SOCK_DGRAM, port);
}
int tcp_listen(in_addr_t addr, unsigned port) {
return inet_listen(addr, SOCK_STREAM, port, 0);
int tcp_listen(in_addr_t addr, unsigned port)
{
return inet_listen(addr, SOCK_STREAM, port, 0);
}
int tcp_connect(in_addr_t addr, unsigned port) {
return inet_connect(addr, SOCK_STREAM, port);
int tcp_connect(in_addr_t addr, unsigned port)
{
return inet_connect(addr, SOCK_STREAM, port);
}
// vim: noexpandtab