if (stat(sun->sun_path, &st))
return (errno == ENOENT ? UNUSED : USED);
- if (!S_ISSOCK(st.st_mode) || !quickp)
+ if (!S_ISSOCK(st.st_mode) || quickp)
return (USED);
rc = USED;
if ((fp = fopen("/proc/net/unix", "r")) == 0)
if (mylen < sizeof(*sun)) ((char *)sun)[mylen] = 0;
if (!sun->sun_path[0]) {
sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = INADDR_LOOPBACK;
+ sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
sin.sin_port = 0;
encode_inet_addr(sun, &sin, WANT_FRESH);
if (real_bind(sk, SA(sun), SUN_LEN(sun)))
size_t n;
char *p, *q, *cmd;
- if ((p = getenv("NOIP_CONFIG")) == 0)
- snprintf(p = buf, sizeof(buf), "%s/.noip", home());
- D( fprintf(stderr, "noip: config file: %s\n", p); )
-
parse_acl_env("NOIP_REALBIND_BEFORE", &bind_tail);
parse_acl_env("NOIP_REALCONNECT_BEFORE", &connect_tail);
if ((p = getenv("NOIP_AUTOPORTS")) != 0) {
parse_autoports(&q);
free(p);
}
- if ((fp = fopen(p, "r")) == 0)
+ if ((p = getenv("NOIP_CONFIG")) == 0)
+ snprintf(p = buf, sizeof(buf), "%s/.noip", home());
+ D( fprintf(stderr, "noip: config file: %s\n", p); )
+
+ if ((fp = fopen(p, "r")) == 0) {
+ D( fprintf(stderr, "noip: couldn't read config: %s\n",
+ strerror(errno)); )
goto done;
+ }
while (fgets(buf, sizeof(buf), fp)) {
n = strlen(buf);
p = buf;
if ((dir = opendir(sockdir)) == 0)
return;
+ sun.sun_family = AF_UNIX;
while ((d = readdir(dir)) != 0) {
if (d->d_name[0] == '.') continue;
snprintf(sun.sun_path, sizeof(sun.sun_path),
"%s/%s", sockdir, d->d_name);
if (decode_inet_addr(&sin, &sun, SUN_LEN(&sun)) ||
stat(sun.sun_path, &st) ||
- !S_ISSOCK(st.st_mode))
+ !S_ISSOCK(st.st_mode)) {
+ D( fprintf(stderr, "noip: ignoring unknown socketdir entry `%s'\n",
+ sun.sun_path); )
continue;
+ }
if (unix_socket_status(&sun, 0) == STALE) {
D( fprintf(stderr, "noip: clearing away stale socket %s\n",
d->d_name); )