DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Merge my working branch 'hmac_support' into hmac_header_fixes

Browse Source
This commit is contained in:
Damien Stuart
2013-03-02 17:22:50 -05:00
parent 73b1931bd8 c1baa7e12f
commit f9e1ae4859
30 changed files with 127 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/access.c
+1
View File
@@ -40,6 +40,7 @@
#include "access.h"
#include "utils.h"
#include "log_msg.h"
#include "rijndael.h"
/* Add an access string entry
*/
server/fw_util_ipf.c
-9
View File
@@ -121,9 +121,6 @@ process_spa_request(const fko_srv_options_t *opts, const acc_stanza_t *acc, spa_
acc_port_list_t *port_list = NULL;
acc_port_list_t *ple;
unsigned int fst_proto;
unsigned int fst_port;
int res = 0;
time_t now;
unsigned int exp_ts;
@@ -136,12 +133,6 @@ process_spa_request(const fko_srv_options_t *opts, const acc_stanza_t *acc, spa_
*/
ple = port_list;
/* Remember the first proto/port combo in case we need them
* for NAT access requests.
*/
fst_proto = ple->proto;
fst_port = ple->port;
/* Set our expire time value.
*/
time(&now);
server/fw_util_ipfw.c
-9
View File
@@ -478,9 +478,6 @@ process_spa_request(const fko_srv_options_t * const opts,
acc_port_list_t *port_list = NULL;
acc_port_list_t *ple;
unsigned int fst_proto;
unsigned int fst_port;
int res = 0;
time_t now;
unsigned int exp_ts;
@@ -493,12 +490,6 @@ process_spa_request(const fko_srv_options_t * const opts,
*/
ple = port_list;
/* Remember the first proto/port combo in case we need them
* for NAT access requests.
*/
fst_proto = ple->proto;
fst_port = ple->port;
/* Set our expire time value.
*/
time(&now);
server/fw_util_pf.c
-9
View File
@@ -202,9 +202,6 @@ process_spa_request(const fko_srv_options_t * const opts,
acc_port_list_t *port_list = NULL;
acc_port_list_t *ple;
unsigned int fst_proto;
unsigned int fst_port;
int res = 0;
time_t now;
unsigned int exp_ts;
@@ -217,12 +214,6 @@ process_spa_request(const fko_srv_options_t * const opts,
*/
ple = port_list;
/* Remember the first proto/port combo in case we need them
* for NAT access requests.
*/
fst_proto = ple->proto;
fst_port = ple->port;
/* Set our expire time value.
*/
time(&now);
server/incoming_spa.c
+1
View File
@@ -43,6 +43,7 @@
#include "fw_util.h"
#include "fwknopd_errors.h"
#include "replay_cache.h"
#include "rijndael.h"
/* Validate and in some cases preprocess/reformat the SPA data. Return an
* error code value if there is any indication the data is not valid spa data.
server/utils.h
-3
View File
@@ -64,7 +64,4 @@ int is_base64(const unsigned char *buf, const unsigned short int len);
int is_valid_dir(const char *path);
int verify_file_perms_ownership(const char *file);
size_t strlcat(char *dst, const char *src, size_t siz);
size_t strlcpy(char *dst, const char *src, size_t siz);
#endif /* UTILS_H */