diff options
| author | whitespace / reindent <invalid@invalid.invalid> | 2017-08-09 11:49:42 +0200 | 
|---|---|---|
| committer | whitespace / reindent <invalid@invalid.invalid> | 2017-08-09 12:03:17 +0200 | 
| commit | ac4d0be5874fafd14212d6007fff7495edc9b152 (patch) | |
| tree | 5e2f0d3189de928c849f9983406389ade3b098cb /pimd/pim_main.c | |
| parent | 76a86854181c27819e5cf71b12ae1fa5ccd9e02a (diff) | |
*: reindentreindent-3.0-after
indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_main.c')
| -rw-r--r-- | pimd/pim_main.c | 146 | 
1 files changed, 70 insertions, 76 deletions
diff --git a/pimd/pim_main.c b/pimd/pim_main.c index d814af6b2c..a168ac754c 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -11,7 +11,7 @@    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, @@ -21,7 +21,7 @@  #include <zebra.h>  #include "log.h" -#include "privs.h"  +#include "privs.h"  #include "version.h"  #include <getopt.h>  #include "command.h" @@ -49,114 +49,108 @@  extern struct host host; -struct option longopts[] = { -  { 0 } -}; +struct option longopts[] = {{0}};  /* pimd privileges */ -zebra_capabilities_t _caps_p [] =  -{ -  ZCAP_NET_ADMIN, -  ZCAP_SYS_ADMIN, -  ZCAP_NET_RAW, -  ZCAP_BIND, +zebra_capabilities_t _caps_p[] = { +	ZCAP_NET_ADMIN, ZCAP_SYS_ADMIN, ZCAP_NET_RAW, ZCAP_BIND,  };  /* pimd privileges to run with */ -struct zebra_privs_t pimd_privs = -{ +struct zebra_privs_t pimd_privs = {  #if defined(FRR_USER) && defined(FRR_GROUP) -  .user = FRR_USER, -  .group = FRR_GROUP, +	.user = FRR_USER, +	.group = FRR_GROUP,  #endif  #ifdef VTY_GROUP -  .vty_group = VTY_GROUP, +	.vty_group = VTY_GROUP,  #endif -  .caps_p = _caps_p, -  .cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]), -  .cap_num_i = 0 -}; +	.caps_p = _caps_p, +	.cap_num_p = sizeof(_caps_p) / sizeof(_caps_p[0]), +	.cap_num_i = 0}; + +FRR_DAEMON_INFO(pimd, PIM, .vty_port = PIMD_VTY_PORT, -FRR_DAEMON_INFO(pimd, PIM, -	.vty_port = PIMD_VTY_PORT, +		.proghelp = "Implementation of the PIM routing protocol.", -	.proghelp = "Implementation of the PIM routing protocol.", +		.signals = pimd_signals, +		.n_signals = 4 /* XXX array_size(pimd_signals) XXX*/, -	.signals = pimd_signals, -	.n_signals = 4 /* XXX array_size(pimd_signals) XXX*/, +		.privs = &pimd_privs, ) -	.privs = &pimd_privs, -) +int main(int argc, char **argv, char **envp) +{ +	frr_preinit(&pimd_di, argc, argv); +	frr_opt_add("", longopts, ""); -int main(int argc, char** argv, char** envp) { -  frr_preinit(&pimd_di, argc, argv); -  frr_opt_add("", longopts, ""); +	/* this while just reads the options */ +	while (1) { +		int opt; -  /* this while just reads the options */ -  while (1) { -    int opt; +		opt = frr_getopt(argc, argv, NULL); -    opt = frr_getopt(argc, argv, NULL); +		if (opt == EOF) +			break; -    if (opt == EOF) -      break; -     -    switch (opt) { -    case 0: -      break; -    default: -      frr_help_exit (1); -      break; -    } -  } +		switch (opt) { +		case 0: +			break; +		default: +			frr_help_exit(1); +			break; +		} +	} -  master = frr_init(); +	master = frr_init(); -  /*  -   * Initializations -   */ -  pim_vrf_init (); -  access_list_init(); -  prefix_list_init (); -  prefix_list_add_hook (pim_prefix_list_update); -  prefix_list_delete_hook (pim_prefix_list_update); +	/* +	 * Initializations +	 */ +	pim_vrf_init(); +	access_list_init(); +	prefix_list_init(); +	prefix_list_add_hook(pim_prefix_list_update); +	prefix_list_delete_hook(pim_prefix_list_update); -  pim_route_map_init (); -  pim_init(); -  pim_msdp_init (master); +	pim_route_map_init(); +	pim_init(); +	pim_msdp_init(master); -  /* -   * Initialize zclient "update" and "lookup" sockets -   */ -  pim_zebra_init(); +	/* +	 * Initialize zclient "update" and "lookup" sockets +	 */ +	pim_zebra_init(); -  frr_config_fork(); +	frr_config_fork();  #ifdef PIM_DEBUG_BYDEFAULT -  zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands"); -  PIM_DO_DEBUG_PIM_EVENTS; -  PIM_DO_DEBUG_PIM_PACKETS; -  PIM_DO_DEBUG_PIM_TRACE; -  PIM_DO_DEBUG_IGMP_EVENTS; -  PIM_DO_DEBUG_IGMP_PACKETS; -  PIM_DO_DEBUG_IGMP_TRACE; -  PIM_DO_DEBUG_ZEBRA; +	zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands"); +	PIM_DO_DEBUG_PIM_EVENTS; +	PIM_DO_DEBUG_PIM_PACKETS; +	PIM_DO_DEBUG_PIM_TRACE; +	PIM_DO_DEBUG_IGMP_EVENTS; +	PIM_DO_DEBUG_IGMP_PACKETS; +	PIM_DO_DEBUG_IGMP_TRACE; +	PIM_DO_DEBUG_ZEBRA;  #endif  #ifdef PIM_CHECK_RECV_IFINDEX_SANITY -  zlog_notice("PIM_CHECK_RECV_IFINDEX_SANITY: will match sock/recv ifindex"); +	zlog_notice( +		"PIM_CHECK_RECV_IFINDEX_SANITY: will match sock/recv ifindex");  #ifdef PIM_REPORT_RECV_IFINDEX_MISMATCH -  zlog_notice("PIM_REPORT_RECV_IFINDEX_MISMATCH: will report sock/recv ifindex mismatch"); +	zlog_notice( +		"PIM_REPORT_RECV_IFINDEX_MISMATCH: will report sock/recv ifindex mismatch");  #endif  #endif  #ifdef PIM_UNEXPECTED_KERNEL_UPCALL -  zlog_notice("PIM_UNEXPECTED_KERNEL_UPCALL: report unexpected kernel upcall"); +	zlog_notice( +		"PIM_UNEXPECTED_KERNEL_UPCALL: report unexpected kernel upcall");  #endif -  frr_run(master); +	frr_run(master); -  /* never reached */ -  return 0; +	/* never reached */ +	return 0;  }  | 
