emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redo DNS lookup on failure to send to remote server

Browse Source 
When entering the forwarding suspend timer, free any previous address
info and do a new DNS lookup when the timer elapses.  The failure to
send may be because we're using a stale IP address.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg 2021-11-27 20:18:52 +01:00
parent f516ff6023
commit f4f2ad365e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/syslogd.c
View File

@ -1573,8 +1573,8 @@ void fprintlog_write(struct filed *f, struct iovec *iov, int iovcnt, int flags)
fwd_suspend = timer_now() - f->f_time; fwd_suspend = timer_now() - f->f_time;
if (fwd_suspend >= INET_SUSPEND_TIME) { if (fwd_suspend >= INET_SUSPEND_TIME) {
logit("\nForwarding suspension over, retrying FORW "); logit("\nForwarding suspension over, retrying FORW ");
f->f_type = F_FORW; f->f_type = F_FORW_UNKN;
goto f_forw; goto f_forw_unkn;
} else { } else {
logit(" %s:%s\n", f->f_un.f_forw.f_hname, f->f_un.f_forw.f_serv); logit(" %s:%s\n", f->f_un.f_forw.f_hname, f->f_un.f_forw.f_serv);
logit("Forwarding suspension not over, time left: %d.\n", logit("Forwarding suspension not over, time left: %d.\n",
@ -1584,6 +1584,7 @@ void fprintlog_write(struct filed *f, struct iovec *iov, int iovcnt, int flags)
case F_FORW_UNKN: case F_FORW_UNKN:
logit("\n"); logit("\n");
f_forw_unkn:
forw_lookup(f); forw_lookup(f);
if (f->f_type == F_FORW) if (f->f_type == F_FORW)
goto f_forw; goto f_forw;
@ -1655,6 +1656,10 @@ void fprintlog_write(struct filed *f, struct iovec *iov, int iovcnt, int flags)
default: default:
f->f_type = F_FORW_SUSP; f->f_type = F_FORW_SUSP;
ERR("INET sendto(%s:%s)", f->f_un.f_forw.f_hname, f->f_un.f_forw.f_serv); ERR("INET sendto(%s:%s)", f->f_un.f_forw.f_hname, f->f_un.f_forw.f_serv);
if (f->f_un.f_forw.f_addr) {
freeaddrinfo(f->f_un.f_forw.f_addr);
f->f_un.f_forw.f_addr = NULL;
}
} }
} }
break; break;
@ -2196,8 +2201,10 @@ static void close_open_log_files(void)
break; break;
case F_FORW: case F_FORW:
if (f->f_un.f_forw.f_addr) if (f->f_un.f_forw.f_addr) {
freeaddrinfo(f->f_un.f_forw.f_addr); freeaddrinfo(f->f_un.f_forw.f_addr);
f->f_un.f_forw.f_addr = NULL;
}
break; break;
} }