Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / pbrd / pbr_main.c

diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c
index c7cbbb4462686f1b0ec5daf50ef0d2fa1a7b8a50..9b34815c4db3a39ee7d5ef3a283ca478ae280049 100644 (file)
--- a/pbrd/pbr_main.c
+++ b/pbrd/pbr_main.c
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * PBR - main code
  * Copyright (C) 2018 Cumulus Networks, Inc.
  *               Donald Sharp
- *
- * FRR is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * FRR is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <zebra.h>
 
@@ -95,7 +82,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t pbr_signals[] = {
+struct frr_signal_t pbr_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,
@@ -160,10 +147,9 @@ int main(int argc, char **argv, char **envp)
 
        pbr_debug_init();
 
-       nexthop_group_init(pbr_nhgroup_add_cb,
+       nexthop_group_init(pbr_nhgroup_add_cb, pbr_nhgroup_modify_cb,
                           pbr_nhgroup_add_nexthop_cb,
-                          pbr_nhgroup_del_nexthop_cb,
-                          pbr_nhgroup_delete_cb);
+                          pbr_nhgroup_del_nexthop_cb, pbr_nhgroup_delete_cb);
 
        /*
         * So we safely ignore these commands since