Merge pull request #12200 from patrasar/pimv6_rp_iif_fix

[mirror_frr.git] / pceplib / pcep_pcc.c

diff --git a/pceplib/pcep_pcc.c b/pceplib/pcep_pcc.c
index 1a702a8b63761e607109d376eff6b17f95915a34..47e357729ceb583076d62ba4a7f1bc8d8aa3610d 100644 (file)
--- a/pceplib/pcep_pcc.c
+++ b/pceplib/pcep_pcc.c
@@ -53,7 +53,7 @@ struct cmd_line_args {
        char dest_ip_str[MAX_DST_IP_STR];
        short src_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 eventpoll; /* poll for pcep_event's, or use callback (default) */
 };
@@ -74,7 +74,6 @@ static const short DEFAULT_SRC_TCP_PORT = 4999;
 // Private fn's
 struct cmd_line_args *get_cmdline_args(int argc, char *argv[]);
 void handle_signal_action(int sig_number);
-int setup_signals(void);
 void send_pce_path_request_message(pcep_session *session);
 void send_pce_report_message(pcep_session *session);
 void print_queue_event(struct pcep_event *event);
@@ -211,11 +210,10 @@ void handle_signal_action(int sig_number)
        }
 }
 
-
-int setup_signals()
+static int setup_signals(void)
 {
        struct sigaction sa;
-       memset(&sa, 0, sizeof(struct sigaction));
+       memset(&sa, 0, sizeof(sa));
        sa.sa_handler = handle_signal_action;
        if (sigaction(SIGINT, &sa, 0) != 0) {
                perror("sigaction()");
@@ -273,7 +271,7 @@ void send_pce_report_message(pcep_session *session)
                pcep_log(LOG_WARNING,
                         "%s: send_pce_report_message SRP object was NULL",
                         __func__);
-                       dll_destroy_with_data(report_list);
+               dll_destroy_with_data(report_list);
                return;
        }
        dll_append(report_list, obj);
@@ -314,7 +312,7 @@ void send_pce_report_message(pcep_session *session)
                pcep_log(LOG_WARNING,
                         "%s: send_pce_report_message LSP object was NULL",
                         __func__);
-                       dll_destroy_with_data(report_list);
+               dll_destroy_with_data(report_list);
                return;
        }
        dll_append(report_list, obj);
@@ -351,7 +349,7 @@ void send_pce_report_message(pcep_session *session)
                pcep_log(LOG_WARNING,
                         "%s: send_pce_report_message ERO object was NULL",
                         __func__);
-                       dll_destroy_with_data(report_list);
+               dll_destroy_with_data(report_list);
                return;
        }
        dll_append(report_list, obj);