#include "platform.h"
#include <gnunet_util_lib.h>
+#include <gnunet_gns_service.h>
#include <microhttpd.h>
#include <curl/curl.h>
+#include <regex.h>
#include "gns_proxy_proto.h"
#include "gns.h"
#define GNUNET_GNS_PROXY_PORT 7777
-//TODO maybe make this an api call
-/**
- * Checks if name is in tld
- *
- * @param name the name to check
- * @param tld the TLD to check for
- * @return GNUNET_YES or GNUNET_NO
- */
-int
-is_tld(const char* name, const char* tld)
-{
- int offset = 0;
+/* MHD/cURL defines */
+#define BUF_WAIT_FOR_CURL 0
+#define BUF_WAIT_FOR_MHD 1
+#define HTML_HDR_CONTENT "Content-Type: text/html\r\n"
- if (strlen(name) <= strlen(tld))
- {
- return GNUNET_NO;
- }
+/* regexp */
+#define RE_DOTPLUS "<a href=\"http://(([A-Za-z]+[.])+)([+])"
+#define RE_N_MATCHES 4
+
+/* The usual suspects */
+#define HTTP_PORT 80
+#define HTTPS_PORT 443
- offset = strlen(name)-strlen(tld);
- if (strcmp (name+offset, tld) != 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "%s is not in .%s TLD\n", name, tld);
- return GNUNET_NO;
- }
- return GNUNET_YES;
-}
+/**
+ * A structure for socks requests
+ */
struct Socks5Request
{
+ /* The client socket */
struct GNUNET_NETWORK_Handle *sock;
- struct GNUNET_NETWORK_Handle *remote_sock;
+ /* The server socket */
+ struct GNUNET_NETWORK_Handle *remote_sock;
+
+ /* The socks state */
int state;
-
+
+ /* Client socket read task */
GNUNET_SCHEDULER_TaskIdentifier rtask;
+
+ /* Server socket read task */
GNUNET_SCHEDULER_TaskIdentifier fwdrtask;
+
+ /* Client socket write task */
GNUNET_SCHEDULER_TaskIdentifier wtask;
+
+ /* Server socket write task */
GNUNET_SCHEDULER_TaskIdentifier fwdwtask;
+ /* Read buffer */
char rbuf[2048];
+
+ /* Write buffer */
char wbuf[2048];
+
+ /* Length of data in read buffer */
unsigned int rbuf_len;
+
+ /* Length of data in write buffer */
unsigned int wbuf_len;
};
-#define BUF_WAIT_FOR_CURL 0
-#define BUF_WAIT_FOR_MHD 1
+/**
+ * A structure for all running Httpds
+ */
+struct MhdHttpList
+{
+ /* DLL for httpds */
+ struct MhdHttpList *prev;
+
+ /* DLL for httpds */
+ struct MhdHttpList *next;
+
+ /* is this an ssl daemon? */
+ int is_ssl;
+
+ /* the domain name to server (only important for SSL) */
+ char domain[256];
+ /* The daemon handle */
+ struct MHD_Daemon *daemon;
+
+ /* The task ID */
+ GNUNET_SCHEDULER_TaskIdentifier httpd_task;
+};
+
+/**
+ * A structure for MHD<->cURL streams
+ */
struct ProxyCurlTask
{
- //DLL
+ /* DLL for tasks */
struct ProxyCurlTask *prev;
+
+ /* DLL for tasks */
struct ProxyCurlTask *next;
+ /* Handle to cURL */
CURL *curl;
+
+ /* The URL to fetch */
char url[2048];
+
+ /* The cURL write buffer / MHD read buffer */
char buffer[CURL_MAX_WRITE_SIZE];
+
+ /* The pointer to the data in the buffer */
char *buffer_ptr;
+
+ /* The buffer status (BUF_WAIT_FOR_CURL or BUF_WAIT_FOR_MHD) */
int buf_status;
- unsigned int bytes_downloaded;
+
+ /* Number of bytes in buffer */
unsigned int bytes_in_buffer;
+
+ /* Indicates wheather the download is in progress */
int download_in_progress;
+
+ /* Indicates wheather the download was successful */
int download_successful;
+
+ /* Indicates wheather the download failed */
int download_error;
- struct MHD_Connection *connection;
+
+ /* Indicates wheather we need to parse HTML */
+ int parse_content;
+
+ /* Indicates wheather we are postprocessing the HTML right now */
+ int is_postprocessing;
+
+ /* Indicates wheather postprocessing has finished */
+ int pp_finished;
+
+ /* Task ID of the postprocessing task */
+ GNUNET_SCHEDULER_TaskIdentifier pp_task;
+
+ /* The postprocessing buffer TODO length? */
+ char pp_buf[256];
+
+ /* The authority of the corresponding host (site of origin) */
+ char authority[256];
+
+ /* The hostname (Host header field) */
+ char host[256];
+
+ /* The associated daemon list entry */
+ struct MhdHttpList *daemon;
};
+/* The port the proxy is running on (default 7777) */
unsigned long port = GNUNET_GNS_PROXY_PORT;
+
+/* The listen socket of the proxy */
static struct GNUNET_NETWORK_Handle *lsock;
+
+/* The listen task ID */
GNUNET_SCHEDULER_TaskIdentifier ltask;
+
+/* The cURL download task */
GNUNET_SCHEDULER_TaskIdentifier curl_download_task;
+
+/* The non SSL httpd daemon handle */
static struct MHD_Daemon *httpd;
+
+/* The http task ID */
static GNUNET_SCHEDULER_TaskIdentifier httpd_task;
-CURLM *curl_multi;
-struct ProxyCurlTask *ctasks_head;
-struct ProxyCurlTask *ctasks_tail;
+/* The cURL multi handle */
+static CURLM *curl_multi;
+/* Handle to the GNS service */
+static struct GNUNET_GNS_Handle *gns_handle;
+
+/* DLL for ProxyCurlTasks */
+static struct ProxyCurlTask *ctasks_head;
+
+/* DLL for ProxyCurlTasks */
+static struct ProxyCurlTask *ctasks_tail;
+
+/* DLL for http daemons */
+static struct MhdHttpList *mhd_httpd_head;
+
+/* DLL for http daemons */
+static struct MhdHttpList *mhd_httpd_tail;
+
+/* Handle to the regex for dotplus (.+) replacement in HTML */
+static regex_t re_dotplus;
+
+/**
+ * Checks if name is in tld
+ *
+ * @param name the name to check
+ * @param tld the TLD to check for
+ * @return GNUNET_YES or GNUNET_NO
+ */
+int
+is_tld(const char* name, const char* tld)
+{
+ int offset = 0;
+
+ if (strlen(name) <= strlen(tld))
+ {
+ return GNUNET_NO;
+ }
+
+ offset = strlen(name)-strlen(tld);
+ if (strcmp (name+offset, tld) != 0)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "%s is not in .%s TLD\n", name, tld);
+ return GNUNET_NO;
+ }
+
+ return GNUNET_YES;
+}
+
+
+/**
+ * Read HTTP request header field 'Host'
+ *
+ * @param cls buffer to write to
+ * @param kind value kind
+ * @param key field key
+ * @param value field value
+ * @return MHD_NO when Host found
+ */
static int
con_val_iter (void *cls,
enum MHD_ValueKind kind,
}
+/**
+ * Check HTTP response header for mime
+ *
+ * @param buffer curl buffer
+ * @param size curl blocksize
+ * @param nmemb curl blocknumber
+ * @param cls handle
+ * @return size of read bytes
+ */
+static size_t
+curl_check_hdr (void *buffer, size_t size, size_t nmemb, void *cls)
+{
+ size_t bytes = size * nmemb;
+ struct ProxyCurlTask *ctask = cls;
+ char hdr[bytes+1];
+
+ memcpy (hdr, buffer, bytes);
+ hdr[bytes] = '\0';
+
+ if (0 == strcmp (hdr, HTML_HDR_CONTENT))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got HTML HTTP response header\n");
+ ctask->parse_content = GNUNET_YES;
+ }
+
+ return bytes;
+}
+
/**
* schedule mhd
+ *
+ * @param hd a http daemon list entry
*/
static void
-run_httpd (void);
+run_httpd (struct MhdHttpList *hd);
+
+
+/**
+ * schedule all mhds
+ *
+ */
+static void
+run_httpds (void);
+
+
+/**
+ * Task that simply runs MHD main loop
+ *
+ * @param cls NULL
+ * @param tc task context
+ */
+static void
+run_mhd (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+
+ struct MhdHttpList *hd;
+
+ for (hd=mhd_httpd_head; hd != NULL; hd = hd->next)
+ MHD_run (hd->daemon);
+}
/**
size_t total;
struct ProxyCurlTask *ctask = ctx;
- MHD_run (httpd);
+ //MHD_run (httpd);
total = size*nmemb;
- ctask->bytes_downloaded += total;
if (total == 0)
{
//GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
// "cURL chunk:\n%s\n", (char*)ctask->buffer);
- MHD_run (httpd);
+ run_mhd (NULL, NULL);
return total;
}
}
+
+
+
+
+/**
+ * Shorten result callback
+ *
+ * @param cls the proxycurltask
+ * @param short_name the shortened name (NULL on error)
+ */
+static void
+process_shorten (void* cls, const char* short_name)
+{
+ struct ProxyCurlTask *ctask = cls;
+
+ char tmp[strlen(ctask->pp_buf)]; //TODO length
+
+ if (NULL == short_name)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MHD PP: Unable to shorten %s\n",
+ ctask->pp_buf);
+ return;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MHD PP: Shorten %s -> %s\n",
+ ctask->pp_buf,
+ short_name);
+
+ sprintf (tmp, "<a href=http://%s", short_name);
+ strcpy (ctask->pp_buf, tmp);
+
+ ctask->pp_finished = GNUNET_YES;
+
+ GNUNET_SCHEDULER_add_now (&run_mhd, NULL);
+}
+
+
+/**
+ * Postprocessing task that uses GNS to shorten names
+ *
+ * @param cls the proxycurltask
+ * @param tc the task context
+ */
+static void
+postprocess_name (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct ProxyCurlTask *ctask = cls;
+ char tmp[strlen(ctask->pp_buf)];
+
+ sprintf ( tmp, "%s%s", ctask->pp_buf, ctask->authority);
+
+ GNUNET_GNS_shorten (gns_handle,
+ tmp,
+ &process_shorten,
+ ctask);
+
+}
+
/**
* Callback for MHD response
*
{
struct ProxyCurlTask *ctask = cls;
ssize_t copied = 0;
+ size_t bytes_to_copy;
+ int nomatch;
+ char *hostptr;
+ regmatch_t m[RE_N_MATCHES];
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MHD: content cb\n");
if (ctask->download_successful &&
(ctask->buf_status == BUF_WAIT_FOR_CURL))
ctask->download_in_progress = GNUNET_NO;
curl_multi_remove_handle (curl_multi, ctask->curl);
curl_easy_cleanup (ctask->curl);
+ GNUNET_SCHEDULER_add_now (&run_mhd, NULL);
return MHD_CONTENT_READER_END_OF_STREAM;
}
ctask->download_in_progress = GNUNET_NO;
curl_multi_remove_handle (curl_multi, ctask->curl);
curl_easy_cleanup (ctask->curl);
+ GNUNET_SCHEDULER_add_now (&run_mhd, NULL);
return MHD_CONTENT_READER_END_WITH_ERROR;
}
if ( ctask->buf_status == BUF_WAIT_FOR_CURL )
- {
return 0;
+
+ bytes_to_copy = ctask->bytes_in_buffer;
+
+ if (ctask->parse_content == GNUNET_YES)
+ {
+
+ GNUNET_log ( GNUNET_ERROR_TYPE_DEBUG,
+ "MHD: We need to parse the HTML %s\n", ctask->buffer_ptr);
+
+ nomatch = regexec ( &re_dotplus, ctask->buffer_ptr, RE_N_MATCHES, m, 0);
+
+ if (!nomatch)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MHD RE: Match\n");
+
+ GNUNET_assert (m[1].rm_so != -1);
+
+ hostptr = ctask->buffer_ptr+m[1].rm_so;
+
+ if (m[0].rm_so > 0)
+ {
+ bytes_to_copy = m[0].rm_so;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Copying %d bytes.\n", m[0].rm_so);
+
+
+ }
+ else
+ {
+ if (ctask->is_postprocessing == GNUNET_YES)
+ {
+
+ /*Done?*/
+ if ( ctask->pp_finished == GNUNET_NO )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MHD PP: Waiting for PP of %s\n", ctask->pp_buf);
+ return 0;
+ }
+
+ ctask->is_postprocessing = GNUNET_NO;
+
+ ctask->bytes_in_buffer -= m[0].rm_eo;//(m[1].rm_eo-m[1].rm_so);
+ ctask->buffer_ptr += m[0].rm_eo;//(m[1].rm_eo-m[1].rm_so);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Skipping next %d bytes in buffer\n", m[0].rm_eo);
+
+ GNUNET_SCHEDULER_add_now (&run_mhd, NULL);
+
+ if ( strlen (ctask->pp_buf) <= max )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Copying postprocessed %s.\n", ctask->pp_buf);
+ memcpy ( buf, ctask->pp_buf, strlen (ctask->pp_buf) );
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Done %s.\n", buf);
+ ctask->is_postprocessing = GNUNET_NO;
+ return strlen (ctask->pp_buf);
+ }
+
+ return 0;
+ }
+
+ memset (ctask->pp_buf, 0, sizeof(ctask->pp_buf));
+ memcpy (ctask->pp_buf, hostptr, (m[1].rm_eo-m[1].rm_so));
+
+ ctask->is_postprocessing = GNUNET_YES;
+ ctask->pp_finished = GNUNET_NO;
+
+ //postprocess_name(ctask, NULL);
+ ctask->pp_task = GNUNET_SCHEDULER_add_now (&postprocess_name, ctask);
+
+ return 0;
+ }
+ }
}
- if ( ctask->bytes_in_buffer > max )
+ if ( bytes_to_copy > max )
{
GNUNET_log ( GNUNET_ERROR_TYPE_DEBUG,
"MHD: buffer in response too small! (%s)\n",
{
GNUNET_log ( GNUNET_ERROR_TYPE_DEBUG,
"MHD: copying %d bytes to mhd response at offset %d\n",
- ctask->bytes_in_buffer, pos);
+ bytes_to_copy, pos);
- memcpy ( buf, ctask->buffer_ptr, ctask->bytes_in_buffer );
- copied = ctask->bytes_in_buffer;
- ctask->buf_status = BUF_WAIT_FOR_CURL;
- ctask->buffer_ptr = ctask->buffer;
- curl_easy_pause (ctask->curl, CURLPAUSE_CONT);
+ memcpy ( buf, ctask->buffer_ptr, bytes_to_copy );
+ copied = bytes_to_copy;
+ if (bytes_to_copy < ctask->bytes_in_buffer)
+ {
+ ctask->bytes_in_buffer -= bytes_to_copy;
+ ctask->buffer_ptr += bytes_to_copy;
+ }
+ else
+ {
+ ctask->bytes_in_buffer = 0;
+ ctask->buf_status = BUF_WAIT_FOR_CURL;
+ ctask->buffer_ptr = ctask->buffer;
+ curl_easy_pause (ctask->curl, CURLPAUSE_CONT);
+ GNUNET_SCHEDULER_add_now (&run_mhd, NULL);
+ }
}
+ GNUNET_SCHEDULER_add_now (&run_mhd, NULL);
+
return copied;
}
GNUNET_assert ( num_ctasks == running );
- run_httpd ();
+ run_httpds ();
} while (mret == CURLM_CALL_MULTI_PERFORM);
curl_download_prepare();
}
+/**
+ * Initialize download and trigger curl
+ *
+ * @param cls the proxycurltask
+ * @param auth_name the name of the authority (site of origin) of ctask->host
+ *
+ */
+static void
+process_get_authority (void* cls,
+ const char* auth_name)
+{
+ struct ProxyCurlTask *ctask = cls;
+
+ if (NULL == auth_name)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Get authority failed!\n");
+ strcpy (ctask->authority, "");
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Get authority yielded %s\n", auth_name);
+ strcpy (ctask->authority, auth_name);
+
+ curl_download_prepare ();
+}
/**
* Main MHD callback for handling requests.
ctask->download_in_progress = GNUNET_YES;
ctask->download_successful = GNUNET_NO;
- ctask->bytes_downloaded = 0;
- ctask->connection = con;
ctask->buf_status = BUF_WAIT_FOR_CURL;
ctask->bytes_in_buffer = 0;
+ ctask->parse_content = GNUNET_NO;
+ curl_easy_setopt (ctask->curl, CURLOPT_HEADERFUNCTION, &curl_check_hdr);
+ curl_easy_setopt (ctask->curl, CURLOPT_HEADERDATA, ctask);
curl_easy_setopt (ctask->curl, CURLOPT_WRITEFUNCTION, &callback_download);
curl_easy_setopt (ctask->curl, CURLOPT_WRITEDATA, ctask);
curl_easy_setopt (ctask->curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt (ctask->curl, CURLOPT_MAXREDIRS, 4);
/* no need to abort if the above failed */
sprintf (curlurl, "http://%s%s", host, url);
+ strcpy (ctask->host, host);
strcpy (ctask->url, curlurl);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Adding new curl task for %s\n", curlurl);
}
GNUNET_CONTAINER_DLL_insert (ctasks_head, ctasks_tail, ctask);
-
- curl_download_prepare ();
+
+ GNUNET_GNS_get_authority (gns_handle,
+ ctask->host,
+ &process_get_authority,
+ ctask);
+ //download_prepare (ctask);
+ //curl_download_prepare ();
response = MHD_create_response_from_callback (-1, -1,
&mhd_content_cb,
const struct GNUNET_SCHEDULER_TaskContext *tc);
+/**
+ * run all httpd
+ */
+static void
+run_httpds ()
+{
+ struct MhdHttpList *hd;
+
+ for (hd=mhd_httpd_head; hd != NULL; hd = hd->next)
+ run_httpd (hd);
+
+}
+
/**
* schedule mhd
*/
static void
-run_httpd ()
+run_httpd (struct MhdHttpList *hd)
{
fd_set rs;
fd_set ws;
wes = GNUNET_NETWORK_fdset_create ();
wws = GNUNET_NETWORK_fdset_create ();
max = -1;
- GNUNET_assert (MHD_YES == MHD_get_fdset (httpd, &rs, &ws, &es, &max));
+ GNUNET_assert (MHD_YES == MHD_get_fdset (hd->daemon, &rs, &ws, &es, &max));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MHD fds: max=%d\n", max);
- haveto = MHD_get_timeout (httpd, &timeout);
+ haveto = MHD_get_timeout (hd->daemon, &timeout);
if (haveto == MHD_YES)
tv.rel_value = (uint64_t) timeout;
GNUNET_NETWORK_fdset_copy_native (wes, &es, max + 1);
if (httpd_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (httpd_task);
- httpd_task =
+ GNUNET_SCHEDULER_cancel (hd->httpd_task);
+ hd->httpd_task =
GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
tv, wrs, wws,
- &do_httpd, NULL);
+ &do_httpd, hd);
GNUNET_NETWORK_fdset_destroy (wrs);
GNUNET_NETWORK_fdset_destroy (wws);
GNUNET_NETWORK_fdset_destroy (wes);
}
+
/**
* Task run whenever HTTP server operations are pending.
*
do_httpd (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- httpd_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "MHD run \n");
- MHD_run (httpd);
- run_httpd ();
+ struct MhdHttpList *hd = cls;
+
+ hd->httpd_task = GNUNET_SCHEDULER_NO_TASK;
+
+ MHD_run (hd->daemon);
+ run_httpd (hd);
}
+
/**
* Read data from socket
*
}
+/**
+ * Adds a socket to MHD
+ *
+ * @param h the handle to the socket to add
+ * @return whatever MHD_add_connection returns
+ */
static int
-add_handle_to_mhd (struct GNUNET_NETWORK_Handle *h)
+add_handle_to_mhd (struct GNUNET_NETWORK_Handle *h, struct MHD_Daemon *daemon)
{
int fd;
struct sockaddr *addr;
addr = GNUNET_NETWORK_get_addr (h);
len = GNUNET_NETWORK_get_addrlen (h);
- return MHD_add_connection (httpd, fd, addr, len);
+ return MHD_add_connection (daemon, fd, addr, len);
+}
+
+
+/*TODO this needs MHD API modification */
+static int http_port = 4444;
+
+
+static long
+get_file_size (const char* filename)
+{
+ FILE *fp;
+
+ fp = fopen (filename, "rb");
+ if (fp)
+ {
+ long size;
+
+ if ((0 != fseek (fp, 0, SEEK_END)) || (-1 == (size = ftell (fp))))
+ size = 0;
+
+ fclose (fp);
+
+ return size;
+ }
+
+ return 0;
+}
+
+/**
+ * Read file in filename
+ *
+ * @param filename file to read
+ * @return data
+ */
+static char*
+load_file (const char* filename)
+{
+ FILE *fp;
+ char *buffer;
+ long size;
+
+ size = get_file_size (filename);
+ if (size == 0)
+ return NULL;
+
+ fp = fopen (filename, "rb");
+ if (!fp)
+ return NULL;
+
+ buffer = GNUNET_malloc (size);
+ if (!buffer)
+ {
+ fclose (fp);
+ return NULL;
+ }
+
+ if (size != fread (buffer, 1, size, fp))
+ {
+ GNUNET_free (buffer);
+ buffer = NULL;
+ }
+
+ fclose (fp);
+ return buffer;
}
+/**
+ * Adds a socket to an SSL MHD instance
+ * It is important the the domain name is
+ * correct. In most cases we need to start a new daemon
+ */
+static int
+add_handle_to_ssl_mhd (struct GNUNET_NETWORK_Handle *h, char* domain)
+{
+ struct MhdHttpList *hd = NULL;
+
+ static char *key_pem;
+ static char *cert_pem;
+
+ key_pem = load_file ("server.key");
+ cert_pem = load_file ("server.pem");
+
+ for (hd = mhd_httpd_head; hd != NULL; hd = hd->next)
+ {
+ if (0 == strcmp (hd->domain, domain))
+ break;
+ }
+
+ if (NULL == hd)
+ {
+ /* Start new MHD */
+ /* TODO: create cert, start SSL MHD */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No previous SSL instance found... starting new one\n");
+ hd = GNUNET_malloc (sizeof (struct MhdHttpList));
+ hd->is_ssl = GNUNET_YES;
+ strcpy (hd->domain, domain);
+ hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL, http_port++,
+ NULL, NULL,
+ &create_response, NULL,
+ MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 128,
+ MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16,
+ MHD_OPTION_NOTIFY_COMPLETED,
+ NULL, NULL,
+ MHD_OPTION_HTTPS_MEM_KEY, key_pem,
+ MHD_OPTION_HTTPS_MEM_CERT, cert_pem,
+ MHD_OPTION_END);
+ hd->httpd_task = GNUNET_SCHEDULER_NO_TASK;
+
+ GNUNET_CONTAINER_DLL_insert (mhd_httpd_head, mhd_httpd_tail, hd);
+ }
+
+ return add_handle_to_mhd (h, hd->daemon);
+}
+
+
+
/**
* Read data from incoming connection
*
struct socks5_client_request *c_req;
struct socks5_server_response *s_resp;
+ int ret;
char domain[256];
uint8_t dom_len;
uint16_t req_port;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Requested connection is gnunet tld\n",
domain);
+
+ ret = MHD_NO;
+ if (ntohs(req_port) == HTTPS_PORT)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Requested connection is HTTPS\n");
+ ret = add_handle_to_ssl_mhd ( s5r->sock, domain );
+ }
+ else if (NULL != httpd)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Requested connection is HTTP\n");
+ ret = add_handle_to_mhd ( s5r->sock, httpd );
+ }
- if (NULL == httpd)
+ if (ret != MHD_YES)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Failed to start HTTP server\n"));
//GNUNET_free(s5r);
return;
}
-
- if (MHD_YES == add_handle_to_mhd ( s5r->sock ))
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sucessfully added client to MHD!\n");
+
+ /* Signal success */
s_resp->version = 0x05;
s_resp->reply = 0x00;
s_resp->reserved = 0x00;
GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
s5r->sock,
&do_write, s5r);
- run_httpd ();
+ run_httpds ();
//GNUNET_free ( s5r );
//FIXME complete socks resp!
return;
}
+
/**
* Accept new incoming connections
*
//GNUNET_CONTAINER_DLL_insert (s5conns.head, s5conns.tail, s5r);
}
+
/**
* Task run on shutdown
*
do_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (GNUNET_SCHEDULER_NO_TASK != httpd_task)
- {
- GNUNET_SCHEDULER_cancel (httpd_task);
- httpd_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
+
+ struct MhdHttpList *hd;
+ struct MhdHttpList *tmp_hd;
+
if (GNUNET_SCHEDULER_NO_TASK != curl_download_task)
{
GNUNET_SCHEDULER_cancel (curl_download_task);
curl_download_task = GNUNET_SCHEDULER_NO_TASK;
}
- if (NULL != httpd)
+ for (hd = mhd_httpd_head; hd != NULL; hd = tmp_hd)
+ {
+ tmp_hd = hd->next;
+
+ if (GNUNET_SCHEDULER_NO_TASK != hd->httpd_task)
+ {
+ GNUNET_SCHEDULER_cancel (hd->httpd_task);
+ hd->httpd_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (NULL != hd->daemon)
+ {
+ MHD_stop_daemon (hd->daemon);
+ hd->daemon = NULL;
+ }
+
+ GNUNET_free (hd);
+ }
+}
+
+
+/**
+ * Compiles a regex for us
+ *
+ * @param re ptr to re struct
+ * @param rt the expression to compile
+ * @return 0 on success
+ */
+static int
+compile_regex (regex_t *re, const char* rt)
+{
+ int status;
+ char err[1024];
+
+ status = regcomp (re, rt, REG_EXTENDED|REG_NEWLINE);
+ if (status)
{
- MHD_stop_daemon (httpd);
- httpd = NULL;
+ regerror (status, re, err, 1024);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Regex error compiling '%s': %s\n", rt, err);
+ return 1;
}
+ return 0;
}
+
/**
* Main function that will be run
*
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct sockaddr_in sa;
+ struct MhdHttpList *hd;
+
+ compile_regex (&re_dotplus, (char*) RE_DOTPLUS);
+
+ gns_handle = GNUNET_GNS_connect (cfg);
+
+ if (NULL == gns_handle)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unable to connect to GNS!\n");
+ return;
+ }
memset (&sa, 0, sizeof (sa));
sa.sin_family = AF_INET;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Proxy listens on port %u\n",
port);
+
+ mhd_httpd_head = NULL;
+ mhd_httpd_tail = NULL;
- httpd = MHD_start_daemon (MHD_USE_DEBUG, 4444,
+ hd = GNUNET_malloc (sizeof (struct MhdHttpList));
+ hd->is_ssl = GNUNET_NO;
+ strcpy (hd->domain, "");
+ httpd = MHD_start_daemon (MHD_USE_DEBUG, http_port++,
NULL, NULL,
&create_response, NULL,
MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 128,
MHD_OPTION_NOTIFY_COMPLETED,
NULL, NULL,
MHD_OPTION_END);
- run_httpd ();
+ hd->daemon = httpd;
+ hd->httpd_task = GNUNET_SCHEDULER_NO_TASK;
+
+ GNUNET_CONTAINER_DLL_insert (mhd_httpd_head, mhd_httpd_tail, hd);
+
+ run_httpds ();
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&do_shutdown, NULL);
}
+
/**
* The main function for gnunet-gns-proxy.
*
projects / oweals / gnunet.git / blobdiff