Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add extern to *_main global variable declarations in header files.
[vpp.git]
/
src
/
vnet
/
ipsec
/
esp.h
diff --git
a/src/vnet/ipsec/esp.h
b/src/vnet/ipsec/esp.h
index
50cac80
..
bc67f9d
100644
(file)
--- a/
src/vnet/ipsec/esp.h
+++ b/
src/vnet/ipsec/esp.h
@@
-15,6
+15,9
@@
#ifndef __ESP_H__
#define __ESP_H__
#ifndef __ESP_H__
#define __ESP_H__
+#include <vnet/ip/ip.h>
+#include <vnet/ipsec/ipsec.h>
+
#include <openssl/hmac.h>
#include <openssl/rand.h>
#include <openssl/evp.h>
#include <openssl/hmac.h>
#include <openssl/rand.h>
#include <openssl/evp.h>
@@
-77,11
+80,12
@@
typedef struct
esp_main_per_thread_data_t *per_thread_data;
} esp_main_t;
esp_main_per_thread_data_t *per_thread_data;
} esp_main_t;
-esp_main_t esp_main;
+e
xtern e
sp_main_t esp_main;
#define ESP_WINDOW_SIZE (64)
#define ESP_SEQ_MAX (4294967295UL)
#define ESP_WINDOW_SIZE (64)
#define ESP_SEQ_MAX (4294967295UL)
+u8 *format_esp_header (u8 * s, va_list * args);
always_inline int
esp_replay_check (ipsec_sa_t * sa, u32 seq)
always_inline int
esp_replay_check (ipsec_sa_t * sa, u32 seq)
@@
-282,8
+286,8
@@
hmac_calc (ipsec_integ_alg_t alg,
u8 * data, int data_len, u8 * signature, u8 use_esn, u32 seq_hi)
{
esp_main_t *em = &esp_main;
u8 * data, int data_len, u8 * signature, u8 use_esn, u32 seq_hi)
{
esp_main_t *em = &esp_main;
- u32
cpu_index = os_get_cpu_number
();
- HMAC_CTX *ctx = &(em->per_thread_data[
cpu
_index].hmac_ctx);
+ u32
thread_index = vlib_get_thread_index
();
+ HMAC_CTX *ctx = &(em->per_thread_data[
thread
_index].hmac_ctx);
const EVP_MD *md = NULL;
unsigned int len;
const EVP_MD *md = NULL;
unsigned int len;
@@
-292,10
+296,10
@@
hmac_calc (ipsec_integ_alg_t alg,
if (PREDICT_FALSE (em->esp_integ_algs[alg].md == 0))
return 0;
if (PREDICT_FALSE (em->esp_integ_algs[alg].md == 0))
return 0;
- if (PREDICT_FALSE (alg != em->per_thread_data[
cpu
_index].last_integ_alg))
+ if (PREDICT_FALSE (alg != em->per_thread_data[
thread
_index].last_integ_alg))
{
md = em->esp_integ_algs[alg].md;
{
md = em->esp_integ_algs[alg].md;
- em->per_thread_data[
cpu
_index].last_integ_alg = alg;
+ em->per_thread_data[
thread
_index].last_integ_alg = alg;
}
HMAC_Init (ctx, key, key_len, md);
}
HMAC_Init (ctx, key, key_len, md);