diff options
| author | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2011-11-12 19:36:18 +0000 |
|---|---|---|
| committer | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2011-11-12 19:36:18 +0000 |
| commit | c0f83b82fdee92308bd30cb6eb4c4d9836001c2b (patch) | |
| tree | 5f7b39fc467cb5b5cc9af45b62865c3ca5529c9a | |
| parent | 956da57740f3a749158848e3792738a849f93f04 (diff) | |
fix function names in fatalx() messages
ok mikeb
| -rw-r--r-- | usr.sbin/relayd/hce.c | 10 | ||||
| -rw-r--r-- | usr.sbin/relayd/pfe.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/relayd/hce.c b/usr.sbin/relayd/hce.c index 147b272bfde..bb0596e8a1f 100644 --- a/usr.sbin/relayd/hce.c +++ b/usr.sbin/relayd/hce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hce.c,v 1.60 2011/05/19 08:56:49 reyk Exp $ */ +/* $OpenBSD: hce.c,v 1.61 2011/11/12 19:36:17 camield Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -289,7 +289,7 @@ hce_dispatch_pfe(int fd, struct privsep_proc *p, struct imsg *imsg) case IMSG_HOST_DISABLE: memcpy(&id, imsg->data, sizeof(id)); if ((host = host_find(env, id)) == NULL) - fatalx("hce_dispatch_imsg: desynchronized"); + fatalx("hce_dispatch_pfe: desynchronized"); host->flags |= F_DISABLE; host->up = HOST_UNKNOWN; host->check_cnt = 0; @@ -299,7 +299,7 @@ hce_dispatch_pfe(int fd, struct privsep_proc *p, struct imsg *imsg) case IMSG_HOST_ENABLE: memcpy(&id, imsg->data, sizeof(id)); if ((host = host_find(env, id)) == NULL) - fatalx("hce_dispatch_imsg: desynchronized"); + fatalx("hce_dispatch_pfe: desynchronized"); host->flags &= ~(F_DISABLE); host->up = HOST_UNKNOWN; host->he = HCE_NONE; @@ -307,7 +307,7 @@ hce_dispatch_pfe(int fd, struct privsep_proc *p, struct imsg *imsg) case IMSG_TABLE_DISABLE: memcpy(&id, imsg->data, sizeof(id)); if ((table = table_find(env, id)) == NULL) - fatalx("hce_dispatch_imsg: desynchronized"); + fatalx("hce_dispatch_pfe: desynchronized"); table->conf.flags |= F_DISABLE; TAILQ_FOREACH(host, &table->hosts, entry) host->up = HOST_UNKNOWN; @@ -315,7 +315,7 @@ hce_dispatch_pfe(int fd, struct privsep_proc *p, struct imsg *imsg) case IMSG_TABLE_ENABLE: memcpy(&id, imsg->data, sizeof(id)); if ((table = table_find(env, id)) == NULL) - fatalx("hce_dispatch_imsg: desynchronized"); + fatalx("hce_dispatch_pfe: desynchronized"); table->conf.flags &= ~(F_DISABLE); TAILQ_FOREACH(host, &table->hosts, entry) host->up = HOST_UNKNOWN; diff --git a/usr.sbin/relayd/pfe.c b/usr.sbin/relayd/pfe.c index a56d135d7c4..3830d332b1a 100644 --- a/usr.sbin/relayd/pfe.c +++ b/usr.sbin/relayd/pfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe.c,v 1.70 2011/05/20 09:43:53 reyk Exp $ */ +/* $OpenBSD: pfe.c,v 1.71 2011/11/12 19:36:17 camield Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -111,7 +111,7 @@ pfe_dispatch_hce(int fd, struct privsep_proc *p, struct imsg *imsg) IMSG_SIZE_CHECK(imsg, &st); memcpy(&st, imsg->data, sizeof(st)); if ((host = host_find(env, st.id)) == NULL) - fatalx("pfe_dispatch_imsg: invalid host id"); + fatalx("pfe_dispatch_hce: invalid host id"); host->he = st.he; if (host->flags & F_DISABLE) break; @@ -124,7 +124,7 @@ pfe_dispatch_hce(int fd, struct privsep_proc *p, struct imsg *imsg) if (host->check_cnt != st.check_cnt) { log_debug("%s: host %d => %d", __func__, host->conf.id, host->up); - fatalx("pfe_dispatch_imsg: desynchronized"); + fatalx("pfe_dispatch_hce: desynchronized"); } if (host->up == st.up) @@ -136,7 +136,7 @@ pfe_dispatch_hce(int fd, struct privsep_proc *p, struct imsg *imsg) if ((table = table_find(env, host->conf.tableid)) == NULL) - fatalx("pfe_dispatch_imsg: invalid table id"); + fatalx("pfe_dispatch_hce: invalid table id"); log_debug("%s: state %d for host %u %s", __func__, st.up, host->conf.id, host->conf.name); |