proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-30 04:31:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: use platform-neutral value for TCP MD5 signature len

Browse Source 
Use a pcep-specific value for MD5SIG_MAXLEN, use the OS value if
present.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2021-04-08 08:56:32 -04:00
parent 964788a11f
commit 2a034138d4
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pathd/path_pcep.h
View File

@ -84,7 +84,7 @@ DECLARE_MTYPE(PCEP);
struct pcep_config_group_opts { struct pcep_config_group_opts {
char name[64]; char name[64];
char tcp_md5_auth[TCP_MD5SIG_MAXKEYLEN]; char tcp_md5_auth[PCEP_MD5SIG_MAXKEYLEN];
struct ipaddr source_ip; struct ipaddr source_ip;
short source_port; short source_port;
bool draft07; bool draft07;

14
pceplib/pcep.h
View File

@ -28,12 +28,10 @@
#endif #endif
#if defined(linux) || defined(GNU_LINUX) #if defined(linux) || defined(GNU_LINUX)
//#include <netinet/in.h>
#define ipv6_u __in6_u #define ipv6_u __in6_u
#else #else
// bsd family /* bsd family */
#define TCP_MD5SIG_MAXKEYLEN 80
//#include <netinet/in.h>
#define ipv6_u __u6_addr #define ipv6_u __u6_addr
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#include <sys/endian.h> #include <sys/endian.h>
@ -45,4 +43,12 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <pthread.h> #include <pthread.h>
/* Cross-compilation seems to have trouble finding this */
#if defined(TCP_MD5SIG_MAXKEYLEN)
#define PCEP_MD5SIG_MAXKEYLEN TCP_MD5SIG_MAXKEYLEN
#else
#define PCEP_MD5SIG_MAXKEYLEN 80
#endif
#endif #endif

2
pceplib/pcep_pcc.c
View File

@ -53,7 +53,7 @@ struct cmd_line_args {
char dest_ip_str[MAX_DST_IP_STR]; char dest_ip_str[MAX_DST_IP_STR];
short src_tcp_port; short src_tcp_port;
short dest_tcp_port; short dest_tcp_port;
char tcp_md5_str[TCP_MD5SIG_MAXKEYLEN]; /* RFC 2385 */ char tcp_md5_str[PCEP_MD5SIG_MAXKEYLEN]; /* RFC 2385 */
bool is_ipv6; bool is_ipv6;
bool eventpoll; /* poll for pcep_event's, or use callback (default) */ bool eventpoll; /* poll for pcep_event's, or use callback (default) */
}; };

2
pceplib/pcep_session_logic.h
View File

@ -122,7 +122,7 @@ typedef struct pcep_configuration_ {
struct pcep_versioning *pcep_msg_versioning; struct pcep_versioning *pcep_msg_versioning;
char tcp_authentication_str[TCP_MD5SIG_MAXKEYLEN]; char tcp_authentication_str[PCEP_MD5SIG_MAXKEYLEN];
bool is_tcp_auth_md5; /* true: RFC 2385, false: RFC 5925 */ bool is_tcp_auth_md5; /* true: RFC 2385, false: RFC 5925 */
} pcep_configuration; } pcep_configuration;

6
pceplib/pcep_socket_comm.h
View File

@ -91,9 +91,9 @@ typedef struct pcep_socket_comm_session_ {
int received_bytes; int received_bytes;
bool close_after_write; bool close_after_write;
void *external_socket_data; /* used for external socket infra */ void *external_socket_data; /* used for external socket infra */
char tcp_authentication_str[TCP_MD5SIG_MAXKEYLEN /* should be used with is_tcp_auth_md5 flag */
+ 1]; /* should be used with is_tcp_auth_md5 char tcp_authentication_str[PCEP_MD5SIG_MAXKEYLEN + 1];
flag */
bool is_tcp_auth_md5; /* flag to distinguish between rfc 2385 (md5) and bool is_tcp_auth_md5; /* flag to distinguish between rfc 2385 (md5) and
rfc 5925 (tcp-ao) */ rfc 5925 (tcp-ao) */