diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2021-01-19 10:53:26 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2021-01-19 10:53:26 +0000 |
| commit | 2738da66fc354121f24623a9cbb1d2bb153ba677 (patch) | |
| tree | cf64936cd67078581baf3222beb69d589bf32090 /usr.sbin/eigrpd/eigrpd.h | |
| parent | a0f6039592204a9962f3b22d3731eca3b2a7d834 (diff) | |
Kill global eigrpd_process and instead pass the proc to merge_config()
and config_clear(). Also set log_procname directly and remove the
log_procnames array.
Diffstat (limited to 'usr.sbin/eigrpd/eigrpd.h')
| -rw-r--r-- | usr.sbin/eigrpd/eigrpd.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/usr.sbin/eigrpd/eigrpd.h b/usr.sbin/eigrpd/eigrpd.h index 4a7f599173f..41d5fdfbdb6 100644 --- a/usr.sbin/eigrpd/eigrpd.h +++ b/usr.sbin/eigrpd/eigrpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eigrpd.h,v 1.25 2018/08/05 08:10:35 mestre Exp $ */ +/* $OpenBSD: eigrpd.h,v 1.26 2021/01/19 10:53:25 claudio Exp $ */ /* * Copyright (c) 2015 Renato Westphal <renato@openbsd.org> @@ -61,12 +61,6 @@ #define F_CTL_ACTIVE 0x0400 #define F_CTL_ALLLINKS 0x0800 -static const char * const log_procnames[] = { - "parent", - "eigrpe", - "rde" -}; - struct imsgev { struct imsgbuf ibuf; void (*handler)(int, short, void *); @@ -318,7 +312,7 @@ enum eigrpd_process { PROC_MAIN, PROC_EIGRP_ENGINE, PROC_RDE_ENGINE -} eigrpd_process; +}; struct eigrpd_conf { struct in_addr rtr_id; @@ -502,9 +496,10 @@ void imsg_event_add(struct imsgev *); int imsg_compose_event(struct imsgev *, uint16_t, uint32_t, pid_t, int, void *, uint16_t); struct eigrp *eigrp_find(struct eigrpd_conf *, int, uint16_t); -void merge_config(struct eigrpd_conf *, struct eigrpd_conf *); +void merge_config(struct eigrpd_conf *, struct eigrpd_conf *, + enum eigrpd_process); struct eigrpd_conf *config_new_empty(void); -void config_clear(struct eigrpd_conf *); +void config_clear(struct eigrpd_conf *, enum eigrpd_process); /* printconf.c */ void print_config(struct eigrpd_conf *); |