X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/5edf478f9f729427bb4d979d15b21db049222d68..136740e64e3fedcd725490c2f80d0906de515197:/udp.c diff --git a/udp.c b/udp.c index f420664..77be5b1 100644 --- a/udp.c +++ b/udp.c @@ -21,6 +21,7 @@ #include "util.h" #include "unaligned.h" #include "ipaddr.h" +#include "magic.h" static beforepoll_fn udp_beforepoll; static afterpoll_fn udp_afterpoll; @@ -140,7 +141,7 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds) buffer_init(st->rbuf,0); buf_append_uint32(st->rbuf,dest); buf_append_uint32(st->rbuf,source); - buf_append_uint32(st->rbuf,0); /* NAK is msg type 0 */ + buf_append_uint32(st->rbuf,LABEL_NAK); sendto(st->fd, st->rbuf->start, st->rbuf->size, 0, (struct sockaddr *)&from, sizeof(from)); BUF_FREE(st->rbuf); @@ -241,8 +242,8 @@ static void udp_phase_hook(void *sst, uint32_t new_phase) } if (c==0) { char *argv[4], addrstr[9], portstr[5]; - sprintf(addrstr,"%08lX",(long)st->addr); - sprintf(portstr,"%04X",st->port); + sprintf(addrstr,"%08lX",(long)addr.sin_addr.s_addr); + sprintf(portstr,"%04X",addr.sin_port); argv[0]=st->authbind; argv[1]=addrstr; argv[2]=portstr;