commit c80d09a7855dd29d6df4e1ab61264bb9c963d45c
author Jean-Francois Thibert <jfthibert@google.com> Mon Feb 29 10:05:19 2016 -0500
committer Jean-Francois Thibert <jfthibert@google.com> Mon Feb 29 11:51:56 2016 -0500
tree 417a3847dfafe233e2b0f7dbf121fc7bf22dedf0
parent 3ae63369ce1fa12ab2217e0d6dc7ac91387b864e

Revert "Allow disabling DIAL through SageTV properties"

This reverts commit 7559327f1213deb504dde259dacaf0241094b680.

Change-Id: I72223bc0556d2771c9d7a6d751aad21f99cea479

src/server/dial_server.c

diff --git a/src/server/dial_server.c b/src/server/dial_server.c
index 39e259f..8997162 100644
--- a/src/server/dial_server.c
+++ b/src/server/dial_server.c
@@ -361,27 +361,6 @@
     ds_unlock(ds);
 }
 
-// Add logic to test if we should drop DIAL requests
-#define SAGE_PROPERTIES_PATH "/rw/sage/SageClient.properties"
-#define DIAL_DISABLED_PROPERTY "allow_dial=false"
-
-int dial_allowed() {
-    char property[1024];
-    FILE *sageProperties;
-    if (!(sageProperties = fopen(SAGE_PROPERTIES_PATH,"r"))) {
-        return 1;
-    }
-    while (!feof(sageProperties)) {
-        fgets(property, sizeof(property), sageProperties);
-        if (strncmp(property, DIAL_DISABLED_PROPERTY, strlen(DIAL_DISABLED_PROPERTY))==0) {
-            fclose(sageProperties);
-            return 0;
-        }
-    }
-    fclose(sageProperties);
-    return 1;
-}
-
 static int ends_with(const char *str, const char *suffix) {
     if (!str || !suffix)
         return 0;
@@ -503,11 +482,6 @@
     }
     fprintf(stderr, "Origin %s, Host: %s\n", origin_header, host_header);
     if (event == MG_NEW_REQUEST) {
-        // If DIAL is disabled, drop the request
-        if (!dial_allowed()) {
-          fprintf(stderr, "Dial server is disabled, dropping request\n");
-          return "done";
-        }
         // URL ends with run
         if (!strncmp(request_info->uri + strlen(request_info->uri) - 4, RUN_URI,
                      strlen(RUN_URI))) {

src/server/quick_ssdp.c

diff --git a/src/server/quick_ssdp.c b/src/server/quick_ssdp.c
index dc47b9e..7355072 100644
--- a/src/server/quick_ssdp.c
+++ b/src/server/quick_ssdp.c
@@ -82,14 +82,10 @@
 static char model_name[256];
 static struct mg_context *ctx;
 
-extern int dial_allowed();
-
 static void *request_handler(enum mg_event event,
                              struct mg_connection *conn,
                              const struct mg_request_info *request_info) {
   if (event == MG_NEW_REQUEST) {
-    if (!dial_allowed())
-          return "done";
     if (!strcmp(request_info->uri, "/dd.xml") &&
         !strcmp(request_info->request_method, "GET")) {
       mg_printf(conn, "HTTP/1.1 200 OK\r\n"
@@ -193,16 +189,11 @@
 #endif
       continue;
     }
-    if (dial_allowed()) {
-        fprintf(stderr, "Sending SSDP reply to %s:%d\n",
-              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
-        if (-1 == sendto(s, send_buf, send_size, 0, (struct sockaddr *)&saddr, addrlen)) {
-          perror("sendto");
-          continue;
-        }
-    } else {
-        fprintf(stderr, "Dial server disabled, dropping SSDP reply to %s:%d\n",
-              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+    fprintf(stderr, "Sending SSDP reply to %s:%d\n",
+        inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+    if (-1 == sendto(s, send_buf, send_size, 0, (struct sockaddr *)&saddr, addrlen)) {
+      perror("sendto");
+      continue;
     }
   }
 }