DeforaOS/VPN
DeforaOS/VPN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2014-05-08 01:11:17 +02:00
parent b0cff143b8
commit c6ab1fed5f
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@ -20,11 +20,15 @@
#include "vpn.h" #include "vpn.h"
#include "../config.h" #include "../config.h"
#ifndef PROGNAME
# define PROGNAME PACKAGE
#endif
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
fputs("Usage: " PACKAGE " [-R]\n", stderr); fputs("Usage: " PROGNAME " [-R]\n", stderr);
return 1; return 1;
} }

12
src/vpn.c
View File

@ -28,6 +28,10 @@
#include "vpn.h" #include "vpn.h"
#include "../config.h" #include "../config.h"
#ifndef PROGNAME
# define PROGNAME PACKAGE
#endif
/* VPN */ /* VPN */
/* private */ /* private */
@ -74,7 +78,7 @@ int vpn(AppServerOptions options)
if((appserver = appserver_new(NULL, options, "VPN", NULL)) == NULL) if((appserver = appserver_new(NULL, options, "VPN", NULL)) == NULL)
{ {
error_print(PACKAGE); error_print(PROGNAME);
return 1; return 1;
} }
_client_init(); _client_init();
@ -251,7 +255,7 @@ static VPNClient * _client_add(AppServerClient * asc)
return p; return p;
if((p = realloc(_clients, sizeof(*p) * (_clients_cnt + 1))) == NULL) if((p = realloc(_clients, sizeof(*p) * (_clients_cnt + 1))) == NULL)
{ {
error_set_print(PACKAGE, 1, "%s", strerror(errno)); error_set_print(PROGNAME, 1, "%s", strerror(errno));
return NULL; return NULL;
} }
_clients = p; _clients = p;
@ -274,7 +278,7 @@ static VPNClient * _client_add_socket(AppServerClient * asc, int32_t fd)
if((p = realloc(client->sockets, sizeof(*p) if((p = realloc(client->sockets, sizeof(*p)
* (client->sockets_cnt + 1))) == NULL) * (client->sockets_cnt + 1))) == NULL)
{ {
error_set_print(PACKAGE, 1, "%s", strerror(errno)); error_set_print(PROGNAME, 1, "%s", strerror(errno));
return NULL; return NULL;
} }
client->sockets = p; client->sockets = p;
@ -291,7 +295,7 @@ static VPNClient * _client_remove_socket(VPNClient * client, int32_t fd)
if(fd < 0) /* XXX should never happen */ if(fd < 0) /* XXX should never happen */
{ {
error_set_print(PACKAGE, 1, "%s", strerror(EINVAL)); error_set_print(PROGNAME, 1, "%s", strerror(EINVAL));
return NULL; return NULL;
} }
for(i = 0; i < client->sockets_cnt; i++) for(i = 0; i < client->sockets_cnt; i++)