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

30
src/protocol.c
View file

@ -53,8 +53,7 @@ static char (*request_name[]) = {
static avl_tree_t *past_request_tree;
bool check_id(const char *id)
{
bool check_id(const char *id) {
for(; *id; id++)
if(!isalnum(*id) && *id != '_')
return false;
@ -65,8 +64,7 @@ bool check_id(const char *id)
/* Generic request routines - takes care of logging and error
detection as well */
bool send_request(connection_t *c, const char *format, ...)
{
bool send_request(connection_t *c, const char *format, ...) {
va_list args;
char buffer[MAXBUFSIZE];
int len, request;
@ -106,8 +104,7 @@ bool send_request(connection_t *c, const char *format, ...)
return send_meta(c, buffer, len);
}
void forward_request(connection_t *from)
{
void forward_request(connection_t *from) {
int request;
cp();
@ -128,8 +125,7 @@ void forward_request(connection_t *from)
broadcast_meta(from, from->buffer, from->reqlen);
}
bool receive_request(connection_t *c)
{
bool receive_request(connection_t *c) {
int request;
cp();
@ -178,13 +174,11 @@ bool receive_request(connection_t *c)
return true;
}
static int past_request_compare(const past_request_t *a, const past_request_t *b)
{
static int past_request_compare(const past_request_t *a, const past_request_t *b) {
return strcmp(a->request, b->request);
}
static void free_past_request(past_request_t *r)
{
static void free_past_request(past_request_t *r) {
cp();
if(r->request)
@ -193,22 +187,19 @@ static void free_past_request(past_request_t *r)
free(r);
}
void init_requests(void)
{
void init_requests(void) {
cp();
past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
}
void exit_requests(void)
{
void exit_requests(void) {
cp();
avl_delete_tree(past_request_tree);
}
bool seen_request(char *request)
{
bool seen_request(char *request) {
past_request_t *new, p = {0};
cp();
@ -227,8 +218,7 @@ bool seen_request(char *request)
}
}
void age_past_requests(void)
{
void age_past_requests(void) {
avl_node_t *node, *next;
past_request_t *p;
int left = 0, deleted = 0;