#define DEF_OLD(fn,rt,args) \
typedef rt fn##_fn_type(fn##_args); \
- static rt find_##fn(fn##_args); \
static fn##_fn_type find_##fn, *old_##fn=find_##fn; \
static rt find_##fn(fn##_args) { \
anyfn_type *anyfn; \
return 0;
}
-static char *sun_prep(struct sockaddr_un *sun) {
+static int sun_prep(struct sockaddr_un *sun, const char *leaf) {
const char *dir=getenv("UDP_PRELOAD_DIR");
if (!dir) { errno=ECHILD; return 0; }
memset(sun,0,sizeof(*sun));
sun->sun_family=AF_UNIX;
- int dl = strlen(dir);
- if (dl + 1 + ADDRPORTSTRLEN + 1 > sizeof(sun->sun_path)) {
- errno=ENAMETOOLONG; return 0;
+ size_t dl = strlen(dir);
+ if (dl + 1 + strlen(leaf) + 1 > sizeof(sun->sun_path)) {
+ errno=ENAMETOOLONG; return -1;
}
strcpy(sun->sun_path,dir);
- char *p=sun->sun_path+dl;
- *p++='/';
- return p;
+ sun->sun_path[dl]='/';
+ strcpy(sun->sun_path+dl+1,leaf);
+ return 0;
}
WRAP(socket) {
fdinfo *ent=lookup(fd);
if (!ent) return old_bind(fd,addr,addrlen);
struct sockaddr_un sun;
- char *p=sun_prep(&sun);
- if (addrport2str(p,addr,addrlen)) return -1;
+ char tbuf[ADDRPORTSTRLEN+1];
+ if (addrport2str(tbuf,addr,addrlen)) return -1;
+ if (sun_prep(&sun,tbuf)) return -1;
//fprintf(stderr,"binding %s\n",sun.sun_path);
if (unlink(sun.sun_path) && errno!=ENOENT) return -1;
return old_bind(fd,(const void*)&sun,sizeof(sun));
if (!leaf) leaf="udp";
if (strlen(leaf) > ADDRPORTSTRLEN) { errno=ENAMETOOLONG; return -1; }
struct sockaddr_un sun;
- char *p=sun_prep(&sun);
- strcpy(p,leaf);
+ if (sun_prep(&sun,leaf)) return -1;
char tbuf[ADDRPORTSTRLEN+1];
memset(tbuf,0,sizeof(tbuf));
ssize_t rr=recvmsg(fd,&m,0);
if (rr==-1) return rr;
- if (rr<sizeof(tbuf)) { errno=ENXIO; return -1; }
+ if ((size_t)rr<sizeof(tbuf)) { errno=ENXIO; return -1; }
if (tbuf[ADDRPORTSTRLEN]) { errno=E2BIG; return -1; }
if (str2addrport(tbuf,addr,addrlen)) {
fprintf(stderr, "recvfrom str2addrport `%s' %s\n",tbuf,