comm, site: pass a new "struct comm_addr" rather than sockaddr_in

[secnet.git] / udp.c

diff --git a/udp.c b/udp.c
index 4883d537111e83547e35f2ef16e04e4da3bf7aea..8ec8581f6c28aa1eaa89f002f055feb5f7167427 100644 (file)
--- a/udp.c
+++ b/udp.c
@@ -64,13 +64,14 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
 {
     struct udp *st=state;
     struct sockaddr_in from;
 {
     struct udp *st=state;
     struct sockaddr_in from;

-    int fromlen;
+    socklen_t fromlen;

     struct notify_list *n;
     bool_t done;
     int rv;
 
     if (nfds && (fds->revents & POLLIN)) {
        do {
     struct notify_list *n;
     bool_t done;
     int rv;
 
     if (nfds && (fds->revents & POLLIN)) {
        do {

+           FILLZERO(from);

            fromlen=sizeof(from);
            BUF_ASSERT_FREE(st->rbuf);
            BUF_ALLOC(st->rbuf,"udp_afterpoll");
            fromlen=sizeof(from);
            BUF_ASSERT_FREE(st->rbuf);
            BUF_ALLOC(st->rbuf,"udp_afterpoll");


@@ -95,7 +96,11 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
                }
                done=False;
                for (n=st->notify; n; n=n->next) {
                }
                done=False;
                for (n=st->notify; n; n=n->next) {

-                   if (n->fn(n->state, st->rbuf, &from)) {
+                   struct comm_addr ca;
+                   FILLZERO(ca);
+                   ca.comm=&st->ops;
+                   ca.sin=from;
+                   if (n->fn(n->state, st->rbuf, &ca)) {

                        done=True;
                        break;
                    }
                        done=True;
                        break;
                    }


@@ -156,21 +161,21 @@ static void release_notify(void *commst, void *nst, comm_notify_fn *fn)
 }
 
 static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
 }
 
 static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,

-                         struct sockaddr_in *dest)
+                         const struct comm_addr *dest)

 {
     struct udp *st=commst;
     uint8_t *sa;
 
     if (st->use_proxy) {
        sa=buf->start-8;
 {
     struct udp *st=commst;
     uint8_t *sa;
 
     if (st->use_proxy) {
        sa=buf->start-8;

-       memcpy(sa,&dest->sin_addr,4);
+       memcpy(sa,&dest->sin.sin_addr,4);

        memset(sa+4,0,4);
        memset(sa+4,0,4);

-       memcpy(sa+6,&dest->sin_port,2);
+       memcpy(sa+6,&dest->sin.sin_port,2);

        sendto(st->fd,sa,buf->size+8,0,(struct sockaddr *)&st->proxy,
               sizeof(st->proxy));
     } else {
        sendto(st->fd, buf->start, buf->size, 0,
        sendto(st->fd,sa,buf->size+8,0,(struct sockaddr *)&st->proxy,
               sizeof(st->proxy));
     } else {
        sendto(st->fd, buf->start, buf->size, 0,

-              (struct sockaddr *)dest, sizeof(*dest));
+              (struct sockaddr *)&dest->sin, sizeof(dest->sin));

     }
 
     return True;
     }
 
     return True;


@@ -194,7 +199,7 @@ static void udp_phase_hook(void *sst, uint32_t new_phase)
                     st->loc.file,st->loc.line);
     }
 
                     st->loc.file,st->loc.line);
     }
 

-    memset(&addr, 0, sizeof(addr));
+    FILLZERO(addr);

     addr.sin_family=AF_INET;
     addr.sin_addr.s_addr=htonl(st->addr);
     addr.sin_port=htons(st->port);
     addr.sin_family=AF_INET;
     addr.sin_addr.s_addr=htonl(st->addr);
     addr.sin_port=htons(st->port);


@@ -272,14 +277,14 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
     d=i->data.dict;
 
     j=dict_find_item(d,"address",False,"udp",st->loc);
     d=i->data.dict;
 
     j=dict_find_item(d,"address",False,"udp",st->loc);

-    st->addr=j?st->addr=string_item_to_ipaddr(j, "udp"):INADDR_ANY;
+    st->addr=j?string_item_to_ipaddr(j, "udp"):INADDR_ANY;

     st->port=dict_read_number(d,"port",True,"udp",st->loc,0);
     st->rbuf=find_cl_if(d,"buffer",CL_BUFFER,True,"udp",st->loc);
     st->authbind=dict_read_string(d,"authbind",False,"udp",st->loc);
     l=dict_lookup(d,"proxy");
     if (l) {
        st->use_proxy=True;
     st->port=dict_read_number(d,"port",True,"udp",st->loc,0);
     st->rbuf=find_cl_if(d,"buffer",CL_BUFFER,True,"udp",st->loc);
     st->authbind=dict_read_string(d,"authbind",False,"udp",st->loc);
     l=dict_lookup(d,"proxy");
     if (l) {
        st->use_proxy=True;

-       memset(&st->proxy,0,sizeof(st->proxy));
+       FILLZERO(st->proxy);

        st->proxy.sin_family=AF_INET;
        i=list_elem(l,0);
        if (!i || i->type!=t_string) {
        st->proxy.sin_family=AF_INET;
        i=list_elem(l,0);
        if (!i || i->type!=t_string) {