diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2012-06-01 22:40:56 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2012-06-01 22:40:56 +0100 |
commit | 6f1ac7c16cc78f7587000bcae3ebfc4aba9925e0 (patch) | |
tree | 3acf1602ba1de5f5ade98c30b347799383244422 /helper.c | |
parent | 15271c2345b0eb313ab73e5a6d2b9c87f8fe266e (diff) |
rename saddr -> saddr4, prep for v6 support
Diffstat (limited to 'helper.c')
-rw-r--r-- | helper.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -52,10 +52,10 @@ static void badusage(void) { exit(ENOSYS); } -static struct sockaddr_in saddr; +static struct sockaddr_in saddr4; static void authorised(void) { - if (bind(0,&saddr,sizeof(saddr))) exiterrno(errno); + if (bind(0,&saddr4,sizeof(saddr4))) exiterrno(errno); else _exit(0); } @@ -78,16 +78,16 @@ int main(int argc, const char *const *argv) { if (chdir(CONFIGDIR)) perrorfail("chdir " CONFIGDIR); fnbuf[sizeof(fnbuf)-1]= 0; - memset(&saddr,0,sizeof(saddr)); - saddr.sin_family= AF_INET; - saddr.sin_port= port; - saddr.sin_addr.s_addr= addr; + memset(&saddr4,0,sizeof(saddr4)); + saddr4.sin_family= AF_INET; + saddr4.sin_port= port; + saddr4.sin_addr.s_addr= addr; snprintf(fnbuf,sizeof(fnbuf)-1,"byport/%u",hport); if (!access(fnbuf,X_OK)) authorised(); if (errno != ENOENT) exiterrno(errno); - np= inet_ntoa(saddr.sin_addr); assert(np); + np= inet_ntoa(saddr4.sin_addr); assert(np); snprintf(fnbuf,sizeof(fnbuf)-1,"byaddr/%s:%u",np,hport); if (!access(fnbuf,X_OK)) authorised(); if (errno != ENOENT) exiterrno(errno); |