Bootp server

diff --git a/Makefile b/Makefile
index af13c1e00375e6b07b4a559fee93b9aab367a8dc..abe6ac220ea13fdcf1a882d6b0f365f4b3ad8fad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o dsock.o mvpserver.o udpreplier.o mvpclient.o tcp.o \
+OBJS = $(PLUGIN).o dsock.o mvpserver.o udpreplier.o bootpd.o mvpclient.o tcp.o \
                    remux/ts2ps.o remux/ts2es.o remux/tsremux.o ringbuffer.o \
                    recplayer.o config.o log.o thread.o mvpreceiver.o
 

diff --git a/bootpd.c b/bootpd.c
new file mode 100644 (file)
index 0000000..1786d5e
--- /dev/null
+++ b/bootpd.c
@@ -0,0 +1,405 @@
+/*
+    Copyright 2006 Chris Tallon
+
+    This file is part of VOMP.
+
+    VOMP is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    VOMP is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with VOMP; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "bootpd.h"
+
+//void dump(unsigned char* data, USHORT size);
+//unsigned char dcc(UCHAR c);
+
+Bootpd::Bootpd()
+{
+  log = Log::getInstance();
+}
+
+Bootpd::~Bootpd()
+{
+  shutdown();
+}
+
+int Bootpd::shutdown()
+{
+  if (threadIsActive()) threadCancel();
+  ds.shutdown();
+
+  return 1;
+}
+
+int Bootpd::run()
+{
+  if (threadIsActive()) return 1;
+  log->log("BOOTPD", Log::DEBUG, "Starting bootpd");
+
+  if (!ds.init(16867))
+  {
+    log->log("BOOTPD", Log::DEBUG, "DSock init error");
+    shutdown();
+    return 0;
+  }
+
+  if (!threadStart())
+  {
+    log->log("BOOTPD", Log::DEBUG, "Thread start error");
+    shutdown();
+    return 0;
+  }
+
+  log->log("BOOTPD", Log::DEBUG, "Bootp replier started");
+  return 1;
+}
+
+void Bootpd::threadMethod()
+{
+  int retval;
+  while(1)
+  {
+    log->log("BOOTPD", Log::DEBUG, "Starting wait");
+    retval = ds.waitforMessage(0);
+    log->log("BOOTPD", Log::DEBUG, "Wait finished");
+
+    if (retval == 0)
+    {
+      log->log("BOOTPD", Log::CRIT, "Wait for packet error");
+      return;
+    }
+    else if (retval == 1)
+    {
+      continue;
+    }
+    else
+    {
+      processRequest((UCHAR*)ds.getData(), ds.getDataLength());
+    }
+  }
+}
+
+void Bootpd::processRequest(UCHAR* data, int length)
+{
+  log->log("BOOTPD", Log::DEBUG, "Got request");
+//  dump(data, (USHORT)length);
+
+  if (data[0] != 1) return;  // Check it's a request
+
+
+  // Open a config file for the given MAC
+
+  const char* configDir = cPlugin::ConfigDirectory();
+//  char* configDir = "/opt/dvb/vdr-config-1.3/plugins";
+  if (!configDir)
+  {
+    log->log("BOOTPD", Log::ERR, "No config dir!");
+    return;
+  }
+
+  Config config;
+  char configFileName[PATH_MAX];
+  snprintf(configFileName, PATH_MAX, "%s/vomp-%02X-%02X-%02X-%02X-%02X-%02X.conf", configDir, data[28], data[29], data[30], data[31], data[32], data[33]);
+  if (config.init(configFileName))
+  {
+    log->log("BOOTPD", Log::DEBUG, "Opened config file: %s", configFileName);
+  }
+  else
+  {
+    log->log("BOOTPD", Log::ERR, "Could not open/create config file: %s", configFileName);
+    return;
+  }
+
+  // Get an IP for the MVP (make a local copy so future returns don't all have to free string)
+  char newClientIP[100];
+  newClientIP[0] = '\0';
+  bool configHasIP = false;
+  char* cfnewClientIP = config.getValueString("Boot", "IP");
+  if (cfnewClientIP)
+  {
+    strncpy(newClientIP, cfnewClientIP, 99);
+    delete[] cfnewClientIP;
+    configHasIP = true;
+
+    log->log("BOOTPD", Log::DEBUG, "Found IP %s for MVP", newClientIP);
+  }
+  else
+  {
+    log->log("BOOTPD", Log::WARN, "No IP found for MVP. Hopefully it has one already...");
+  }
+
+  // See if we should enforce the IP from the config file
+  int failure;
+  long enforceConfigIP = config.getValueLong("Boot", "Override IP", &failure);
+  if (newClientIP && enforceConfigIP)
+  {
+    log->log("BOOTPD", Log::DEBUG, "Will enforce IP %s on MVP even if it already has another", newClientIP);
+  }
+  else
+  {
+    log->log("BOOTPD", Log::DEBUG, "Will not change MVP IP if it already has one");
+  }
+
+  // See if the MVP already has an IP
+  bool clientAlreadyHasIP = (data[12] || data[13] || data[14] || data[15]);
+
+  /*
+  Subset of Bootp protocol for MVP
+
+  Incoming fields:
+
+  Opcode                    0              Check for value 1            Set to value 2
+  Hardware type             1
+  Hardware address length   2
+  Hop count                 3
+  Transaction ID            4-7
+  Num seconds               8-9
+  Flags                     10-11
+  Client IP                 12-15
+  Your IP                   16-19                                       Set to MVP IP
+  Server IP                 20-23                                       Set to server IP
+  Gateway IP                24-27
+  Client HW address         28-43  (16)    Use to lookup IP for MVP
+  Server Host Name          44-107 (64)
+  Boot filename             108-235 (128)                               Fill with filename for TFTP
+  Vendor info               236-299 (64)
+
+  IP Possibilities
+
+  mvpAlreadyHasIP    configHasIP    enforceConfigIP    result
+1 Y        0                0                0             discard
+2 Y        0                0                1             discard
+3 Y        0                1                0             set config ip
+4 Y        0                1                1             set config ip
+5 Y        1                0                0             set mvp ip
+6 Y        1                0                1             set enforce false, set mvp ip
+7 Y        1                1                0             set mvp ip
+8 Y        1                1                1             set config ip
+  */
+
+  if (!clientAlreadyHasIP && !configHasIP) // cases 1 & 2
+  {
+    log->log("BOOTPD", Log::DEBUG, "No IP found to give to MVP");
+    return;
+  }
+
+  if (!configHasIP) enforceConfigIP = 0;             // case 6
+
+  // Ok, we will send a reply
+
+  in_addr_t finalMVPIP;
+
+  if ((!clientAlreadyHasIP) || (configHasIP && enforceConfigIP))
+  {
+    // Cases 3 & 4,              case 8
+    log->log("BOOTPD", Log::DEBUG, "Giving MVP IP from config");
+    // Set config ip
+    *((in_addr_t*)&data[16]) = inet_addr(newClientIP);
+    finalMVPIP = *((in_addr_t*)&data[16]);
+  }
+  else
+  {
+    // Cases 5 & 7
+    // copy existing ciaddr to yiaddr?
+    log->log("BOOTPD", Log::DEBUG, "Leave YI=0 as MVP already has good IP");
+    finalMVPIP = *((in_addr_t*)&data[12]);
+  }
+
+  // Set Server IP in packet
+  if (!getmyip(finalMVPIP, (in_addr_t*)&data[20]))
+  {
+    log->log("BOOTPD", Log::ERR, "Get my IP failed");
+  }
+
+  // Set filename
+  strncpy((char*)&data[108], "/mvp/vomp-dongle", 127);
+
+  // set to reply
+  data[0] = 2;
+
+//  dump(data, (USHORT)length);
+
+  ds.send("255.255.255.255", 16868, (char*)data, length);
+}
+
+
+int Bootpd::getmyip(in_addr_t destination, in_addr_t* result)
+{
+  int sockfd, r1, r2;
+  struct sockaddr_in my_addr;
+  struct sockaddr_in dest_addr;
+  socklen_t my_addr_len = sizeof(struct sockaddr_in);
+
+  sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+  if (sockfd == -1) return 0;
+
+  dest_addr.sin_family = AF_INET;
+  dest_addr.sin_port = htons(1);
+  dest_addr.sin_addr.s_addr = destination;
+  memset(&(dest_addr.sin_zero), 0, 8);
+
+  r1 = connect(sockfd, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr));
+  if (r1 == -1)
+  {
+    close(sockfd);
+    return 0;
+  }
+
+  memset(&my_addr, 0, sizeof(struct sockaddr_in));
+  r2 = getsockname(sockfd, (struct sockaddr *)&my_addr, &my_addr_len);
+
+  close(sockfd);
+
+  if (r2 == -1) return 0;
+
+  *result = my_addr.sin_addr.s_addr;
+  return 1;
+}
+
+/*
+void dump(unsigned char* data, USHORT size)
+{
+  printf("Size = %u\n", size);
+
+  USHORT c = 0;
+  while(c < size)
+  {
+    if ((size - c) > 15)
+    {
+      printf(" %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X %02X  %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n",
+        data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6], data[c+7],
+        data[c+8], data[c+9], data[c+10], data[c+11], data[c+12], data[c+13], data[c+14], data[c+15],
+        dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]), dcc(data[c+7]),
+        dcc(data[c+8]), dcc(data[c+9]), dcc(data[c+10]), dcc(data[c+11]), dcc(data[c+12]), dcc(data[c+13]), dcc(data[c+14]), dcc(data[c+15]));
+      c += 16;
+    }
+    else
+    {
+      switch (size - c)
+      {
+        case 15:
+          printf(" %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X     %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6], data[c+7],
+            data[c+8], data[c+9], data[c+10], data[c+11], data[c+12], data[c+13], data[c+14],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]), dcc(data[c+7]),
+            dcc(data[c+8]), dcc(data[c+9]), dcc(data[c+10]), dcc(data[c+11]), dcc(data[c+12]), dcc(data[c+13]), dcc(data[c+14]));
+          c += 15;
+          break;
+        case 14:
+          printf(" %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X        %c%c%c%c%c%c%c%c%c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6], data[c+7],
+            data[c+8], data[c+9], data[c+10], data[c+11], data[c+12], data[c+13],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]), dcc(data[c+7]),
+            dcc(data[c+8]), dcc(data[c+9]), dcc(data[c+10]), dcc(data[c+11]), dcc(data[c+12]), dcc(data[c+13]));
+          c += 14;
+          break;
+        case 13:
+          printf(" %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X %02X  %02X           %c%c%c%c%c%c%c%c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6], data[c+7],
+            data[c+8], data[c+9], data[c+10], data[c+11], data[c+12],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]), dcc(data[c+7]),
+            dcc(data[c+8]), dcc(data[c+9]), dcc(data[c+10]), dcc(data[c+11]), dcc(data[c+12]));
+          c += 13;
+          break;
+        case 12:
+          printf(" %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X %02X               %c%c%c%c%c%c%c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6], data[c+7],
+            data[c+8], data[c+9], data[c+10], data[c+11],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]), dcc(data[c+7]),
+            dcc(data[c+8]), dcc(data[c+9]), dcc(data[c+10]), dcc(data[c+11]));
+          c += 12;
+          break;
+        case 11:
+          printf(" %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X                  %c%c%c%c%c%c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6], data[c+7],
+            data[c+8], data[c+9], data[c+10],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]), dcc(data[c+7]),
+            dcc(data[c+8]), dcc(data[c+9]), dcc(data[c+10]));
+          c += 11;
+          break;
+        case 10:
+          printf(" %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X                     %c%c%c%c%c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6], data[c+7],
+            data[c+8], data[c+9],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]), dcc(data[c+7]),
+            dcc(data[c+8]), dcc(data[c+9]));
+          c += 10;
+          break;
+        case 9:
+          printf(" %02X %02X %02X %02X  %02X %02X %02X %02X  %02X                        %c%c%c%c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6], data[c+7],
+            data[c+8],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]), dcc(data[c+7]),
+            dcc(data[c+8]));
+          c += 9;
+          break;
+        case 8:
+          printf(" %02X %02X %02X %02X  %02X %02X %02X %02X                            %c%c%c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6], data[c+7],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]), dcc(data[c+7]));
+          c += 8;
+          break;
+        case 7:
+          printf(" %02X %02X %02X %02X  %02X %02X %02X                               %c%c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5], data[c+6],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]), dcc(data[c+6]));
+          c += 7;
+          break;
+        case 6:
+          printf(" %02X %02X %02X %02X  %02X %02X                                  %c%c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4], data[c+5],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]), dcc(data[c+5]));
+          c += 6;
+          break;
+        case 5:
+          printf(" %02X %02X %02X %02X  %02X                                     %c%c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3], data[c+4],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]), dcc(data[c+4]));
+          c += 5;
+          break;
+        case 4:
+          printf(" %02X %02X %02X %02X                                         %c%c%c%c\n",
+            data[c], data[c+1], data[c+2], data[c+3],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]), dcc(data[c+3]));
+          c += 4;
+          break;
+        case 3:
+          printf(" %02X %02X %02X                                            %c%c%c\n",
+            data[c], data[c+1], data[c+2],
+            dcc(data[c]), dcc(data[c+1]), dcc(data[c+2]));
+          c += 3;
+          break;
+        case 2:
+          printf(" %02X %02X                                               %c%c\n",
+            data[c], data[c+1],
+            dcc(data[c]), dcc(data[c+1]));
+          c += 2;
+          break;
+        case 1:
+          printf(" %02X                                                  %c\n",
+            data[c],
+            dcc(data[c]));
+          c += 1;
+          break;
+      }
+    }
+  }
+}
+
+unsigned char dcc(UCHAR c)
+{
+  if (isspace(c)) return ' ';
+  if (isprint(c)) return c;
+  return '.';
+}
+*/

diff --git a/bootpd.h b/bootpd.h
new file mode 100644 (file)
index 0000000..91d2992
--- /dev/null
+++ b/bootpd.h
@@ -0,0 +1,53 @@
+/*
+    Copyright 2006 Chris Tallon
+
+    This file is part of VOMP.
+
+    VOMP is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    VOMP is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with VOMP; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef BOOTPD_H
+#define BOOTPD_H
+
+#include <stdio.h>
+#include <signal.h>
+#include <ctype.h>
+#include <vdr/plugin.h>
+
+#include "defines.h"
+#include "log.h"
+#include "dsock.h"
+#include "thread.h"
+#include "config.h"
+
+class Bootpd : public Thread
+{
+  public:
+    Bootpd();
+    virtual ~Bootpd();
+
+    int run();
+    int shutdown();
+
+  private:
+    void threadMethod();
+    void processRequest(UCHAR* data, int length);
+    int getmyip(in_addr_t destination, in_addr_t* result);
+
+    DatagramSocket ds;
+    Log* log;
+};
+
+#endif

diff --git a/dsock.c b/dsock.c
index 8c257f97edb64be7bd52b50abab3a7dc9b9b4c28..80dc53204fcc331dbeda5e66bb48ce0bcd9713bf 100644 (file)
--- a/dsock.c
+++ b/dsock.c
@@ -29,8 +29,7 @@ DatagramSocket::DatagramSocket()
 
 DatagramSocket::~DatagramSocket()
 {
-  if (initted) close(socketnum);
-  initted = 0;
+  shutdown();
 }
 
 bool DatagramSocket::init(short port)
@@ -53,6 +52,9 @@ bool DatagramSocket::init(short port)
     return false;
   }
 
+  int allowed = 1;
+  setsockopt(socketnum, SOL_SOCKET, SO_BROADCAST, &allowed, sizeof(allowed));
+
   FD_ZERO(&readfds);
   FD_SET(socketnum, &readfds);
   tv.tv_sec = 0;
@@ -62,6 +64,12 @@ bool DatagramSocket::init(short port)
   return true;
 }
 
+void DatagramSocket::shutdown()
+{
+  if (initted) close(socketnum);
+  initted = 0;
+}
+
 unsigned char DatagramSocket::waitforMessage(unsigned char how)
 {
   if (!initted) return 0;

diff --git a/dsock.h b/dsock.h
index 33c75dd1008072d1d9a4bf92b5bd58c839315f09..388e006d23149633b597918ad066abe9a640d631 100644 (file)
--- a/dsock.h
+++ b/dsock.h
@@ -44,6 +44,7 @@ class DatagramSocket
     DatagramSocket();
     ~DatagramSocket();
     bool init(short);                 // port
+    void shutdown();
     unsigned char waitforMessage(unsigned char); // int =0-block =1-new wait =2-continue wait
     int getDataLength(void) const;
     char *getData(void);               // returns a pointer to the data

diff --git a/mvpserver.c b/mvpserver.c
index 63d75f76856b54ed79a743b82ef32e712a333f39..98ff62f95bb916d33c96fba3b44b43b561ea64d3 100644 (file)
--- a/mvpserver.c
+++ b/mvpserver.c
@@ -35,6 +35,7 @@ int MVPServer::stop()
   close(listeningSocket);
 
   udpr.shutdown();
+  bootpd.shutdown();
 
   log.log("Main", Log::INFO, "Stopped main server thread");
   log.shutdown();
@@ -75,6 +76,11 @@ int MVPServer::run()
   {
     log.init(Log::DEBUG, cfgLogFilename);
     delete[] cfgLogFilename;
+    log.log("Main", Log::INFO, "Logging started");
+  }
+  else
+  {
+    dsyslog("VOMP: Logging disabled");
   }
 
   // Work out a name for this server
@@ -103,6 +109,20 @@ int MVPServer::run()
     return 0;
   }
 
+  if (config.getValueString("General", "Bootp server"))
+  {
+    if (!bootpd.run())
+    {
+      log.log("Main", Log::CRIT, "Could not start Bootpd");
+      stop();
+      return 0;
+    }
+  }
+  else
+  {
+    log.log("Main", Log::INFO, "Not starting Bootpd");
+  }
+
   // start thread here
   if (!threadStart())
   {

diff --git a/mvpserver.h b/mvpserver.h
index 6c6801e42e417931b86e28275f4ee6fbc1bbb533..06f101ac05bc45bb4090a67b60cac3e4a8c5b83e 100644 (file)
--- a/mvpserver.h
+++ b/mvpserver.h
@@ -27,6 +27,7 @@
 
 #include "defines.h"
 #include "udpreplier.h"
+#include "bootpd.h"
 #include "mvpclient.h"
 #include "thread.h"
 #include "config.h"
@@ -46,6 +47,7 @@ class MVPServer : public Thread
     Log log;
     Config config;
     UDPReplier udpr;
+    Bootpd bootpd;
     int listeningSocket;
 };
 

diff --git a/thread.c b/thread.c
index 75b4281dcb15605865ce91b2cd223cff25a495cb..fe5490a3fe03b4fc6230887615edd135edcf5874 100755 (executable)
--- a/thread.c
+++ b/thread.c
@@ -37,6 +37,11 @@ void Thread::threadInternalStart2()
   threadMethod();
 }
 
+Thread::Thread()
+{
+  threadActive = 0;
+}
+
 int Thread::threadStart()
 {
   pthread_cond_init(&threadCond, NULL);

diff --git a/thread.h b/thread.h
index 1516fe55d51f53aa7e0f1f404ec76812a4b3bc9d..bef94be0fed971fd0df61eea9727a84d5ffcdbfb 100755 (executable)
--- a/thread.h
+++ b/thread.h
@@ -52,6 +52,7 @@ class Thread
     pthread_mutex_t threadCondMutex;
 
   public:
+    Thread();
     virtual ~Thread() {};
     void threadInternalStart2();
 };

diff --git a/vomp.conf.sample b/vomp.conf.sample
index d1ab890b5f87da07cee17878b6e9043493959eaf..2cc51cc003c7d21b17a54513637634298099be45 100644 (file)
--- a/vomp.conf.sample
+++ b/vomp.conf.sample
@@ -9,3 +9,10 @@
 ## server select list on the MVP
 
 # Server name = MyServer
+
+## Enable this to start the built in Bootp server
+## Required to boot the MVP if you have not got a
+## DHCP server that can tell the MVP its boot file
+## name and server
+
+# Bootp server = 1