empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Saner error handling in typed_wu()

Browse source 
Leave nat_ann, nat_tgm alone and return -1 on all errors.  Before,
only failed open was handled that way.  Failed write and close were
logged and ignored.  While there, improve the log messages a bit.

Note: the return value fix has little effect.  It makes tele() log the
failure, which is redundant.  Everything else goes through wu() and
ignores the value.
This commit is contained in:
Markus Armbruster 2011-11-20 15:14:36 +01:00
parent 0b2b51bbcb
commit 9f9cbfb20c
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/subs/wu.c
View file

@ -120,7 +120,6 @@ typed_wu(natid from, natid to, char *message, int type)
struct iovec iov[2]; struct iovec iov[2];
int fd; int fd;
char box[1024]; char box[1024];
int write_ok = 0;
int new_tele = 0; int new_tele = 0;
struct player *other; struct player *other;
@ -137,9 +136,10 @@ typed_wu(natid from, natid to, char *message, int type)
#else #else
if ((fd = open(box, O_WRONLY | O_APPEND | O_BINARY, 0)) < 0) { if ((fd = open(box, O_WRONLY | O_APPEND | O_BINARY, 0)) < 0) {
#endif #endif
logerror("telegram 'open' of %s (#%d) failed", box, to); logerror("telegram 'open' of %s failed", box);
return -1; return -1;
} }
memset(&tel, 0, sizeof(tel)); memset(&tel, 0, sizeof(tel));
tel.tel_from = from; tel.tel_from = from;
(void)time(&tel.tel_date); (void)time(&tel.tel_date);
@ -151,13 +151,16 @@ typed_wu(natid from, natid to, char *message, int type)
iov[1].iov_base = message; iov[1].iov_base = message;
iov[1].iov_len = len; iov[1].iov_len = len;
if (writev(fd, iov, 2) < (int)(iov[0].iov_len + iov[1].iov_len)) { if (writev(fd, iov, 2) < (int)(iov[0].iov_len + iov[1].iov_len)) {
logerror("telegram 'write' to #%d failed", to); logerror("telegram 'write' to %s failed", box);
} else close(fd);
write_ok = 1; return -1;
}
if (close(fd) < 0) {
logerror("telegram 'write' to %s failed to close.", box);
return -1;
}
if (close(fd) == -1) { if (type == TEL_ANNOUNCE) {
logerror("telegram 'write' to #%d failed to close.", to);
} else if (write_ok && type == TEL_ANNOUNCE) {
for (to = 0; NULL != (np = getnatp(to)); to++) { for (to = 0; NULL != (np = getnatp(to)); to++) {
if (np->nat_stat < STAT_SANCT) if (np->nat_stat < STAT_SANCT)
continue; continue;
@ -166,7 +169,7 @@ typed_wu(natid from, natid to, char *message, int type)
np->nat_ann++; np->nat_ann++;
putnat(np); putnat(np);
} }
} else if (write_ok) { } else {
new_tele = telegram_is_new(to, &tel); new_tele = telegram_is_new(to, &tel);
np->nat_tgms += new_tele || np->nat_tgms == 0; np->nat_tgms += new_tele || np->nat_tgms == 0;
putnat(np); putnat(np);