[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21706 - in gnunet/src: gns include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21706 - in gnunet/src: gns include util |
Date: |
Fri, 1 Jun 2012 18:29:41 +0200 |
Author: schanzen
Date: 2012-06-01 18:29:41 +0200 (Fri, 01 Jun 2012)
New Revision: 21706
Modified:
gnunet/src/gns/gnunet-gns-proxy.c
gnunet/src/include/gnunet_network_lib.h
gnunet/src/util/network.c
Log:
-added accessors for network handle
Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c 2012-06-01 16:10:17 UTC (rev 21705)
+++ gnunet/src/gns/gnunet-gns-proxy.c 2012-06-01 16:29:41 UTC (rev 21706)
@@ -371,7 +371,20 @@
}
+static int
+add_handle_to_mhd (struct GNUNET_NETWORK_Handle *h)
+{
+ int fd;
+ struct sockaddr *addr;
+ socklen_t len;
+ fd = GNUNET_NETWORK_get_fd (h);
+ addr = GNUNET_NETWORK_get_addr (h);
+ len = GNUNET_NETWORK_get_addrlen (h);
+
+ return MHD_add_connection (httpd, fd, addr, len);
+}
+
/**
* Read data from incoming connection
*
@@ -500,6 +513,11 @@
//GNUNET_free(s5r);
return;
}
+
+ add_handle_to_mhd ( s5r->sock );
+ //GNUNET_free ( s5r );
+ //FIXME complete socks resp!
+ return;
}
}
else
Modified: gnunet/src/include/gnunet_network_lib.h
===================================================================
--- gnunet/src/include/gnunet_network_lib.h 2012-06-01 16:10:17 UTC (rev
21705)
+++ gnunet/src/include/gnunet_network_lib.h 2012-06-01 16:29:41 UTC (rev
21706)
@@ -374,6 +374,26 @@
/**
+ * Return the sockaddr for this network handle
+ *
+ * @param desc wrapper to process
+ * @return POSIX file descriptor
+ */
+struct sockaddr*
+GNUNET_NETWORK_get_addr (struct GNUNET_NETWORK_Handle *desc);
+
+
+/**
+ * Return sockaddr length for this network handle
+ *
+ * @param desc wrapper to process
+ * @return socklen_t for sockaddr
+ */
+socklen_t
+GNUNET_NETWORK_get_addrlen (struct GNUNET_NETWORK_Handle *desc);
+
+
+/**
* Copy a native fd set
* @param to destination
* @param from native source set
Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c 2012-06-01 16:10:17 UTC (rev 21705)
+++ gnunet/src/util/network.c 2012-06-01 16:29:41 UTC (rev 21706)
@@ -865,8 +865,30 @@
return desc->fd;
}
+/**
+ * Return sockaddr for this network handle
+ *
+ * @param desc wrapper to process
+ * @return sockaddr
+ */
+struct sockaddr*
+GNUNET_NETWORK_get_addr (struct GNUNET_NETWORK_Handle *desc)
+{
+ return desc->addr;
+}
/**
+ * Return sockaddr length for this network handle
+ *
+ * @param desc wrapper to process
+ * @return socklen_t for sockaddr
+ */
+socklen_t
+GNUNET_NETWORK_get_addrlen (struct GNUNET_NETWORK_Handle *desc)
+{
+ return desc->addrlen;
+}
+/**
* Copy a native fd set
*
* @param to destination
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21706 - in gnunet/src: gns include util,
gnunet <=