X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d664113aeed50a5d28a4f2235f226df62b8c2820..9ebbfd898ca6ce4f9e32b64aca3f3972a3a74e2c:/uart/uart_posix.c

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index e3113e86..214cb56a 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -55,6 +55,12 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
+// Fix missing definition on OS X.
+// Taken from https://github.com/unbit/uwsgi/commit/b608eb1772641d525bfde268fe9d6d8d0d5efde7
+#ifndef SOL_TCP
+#define SOL_TCP IPPROTO_TCP
+#endif
+
 typedef struct termios term_info;
 typedef struct {
   int fd;           // Serial port file descriptor
@@ -63,9 +69,9 @@ typedef struct {
 } serial_port_unix;
 
 // Set time-out on 30 miliseconds
-const struct timeval timeout = {
+struct timeval timeout = {
   .tv_sec  =     0, // 0 second
-  .tv_usec = 300000  // 300000 micro seconds
+  .tv_usec = 30000  // 30000 micro seconds
 };
 
 serial_port uart_open(const char* pcPortName)
@@ -82,6 +88,10 @@ serial_port uart_open(const char* pcPortName)
     }
     char *colon = strrchr(addrstr, ':');
     char *portstr;
+
+    // Set time-out to 300 miliseconds only for TCP port
+    timeout.tv_usec = 300000;
+
     if (colon) {
       portstr = colon + 1;
       *colon = '\0';