BlinkenLib

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -20,7 +20,7 @@ int main( int argCnt, char * * args )

   //print info

   printf( "BlinkenLib - BlinkenConv\n"

-          "version 0.5 date 2005-12-06\n"

+          "version 0.5.1 date 2005-12-14\n"

           "Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>\n"

           "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"

           "a blinkenarea.org project\n\n" );

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -16,6 +16,7 @@

 #include <arpa/inet.h>

 #include <netinet/in.h>

 #include <sys/types.h>

+#include <sys/time.h>

 #include <sys/socket.h>

 #include "BlinkenLib.h"

@@ -145,45 +146,64 @@ static int serial_settings_set( int fd, int settings )

   return 1;

 }

-//recevie frames from socket and output them

-static void recv_and_out( int udpSocket, int dev_fd,

+//receive frames from socket and output them

+//dev_fd may be -1 for not doing anything with device

+//returns error code (not for device-errors, 0 for success)

+static int recv_and_out( int udpSocket, int dev_fd,

+                         int * p_device_output_active,

                          unsigned int format_change,

                          unsigned int format_height, unsigned int format_width,

                          unsigned int format_channels, unsigned int format_colors,

-                          etBlinkenProto proto )

+                         etBlinkenProto proto,

+                         int use_msecs, unsigned int msecs )

 {

   fd_set readFds, errFds;

-  stBlinkenFrame * pLastFrame, * pFrame;

+  stBlinkenFrame * pFrame;

   char buffer[65536]; //64kB is more than maximum UDP size

-  int maxFd, len;

-  int dev_eof = 0;

+  int maxFd, len, dev_eof;

+  struct timeval start, timeout, * p_timeout, end;

+  dev_eof = 0;

   for( ; ; )

   {

     //wait for next frame

     FD_ZERO( &readFds );

     FD_SET( udpSocket, &readFds );

-    if( ! dev_eof )

+    if( dev_fd != -1 && ! dev_eof )

       FD_SET( dev_fd, &readFds );

     FD_ZERO( &errFds );

     FD_SET( udpSocket, &errFds );

+    if( dev_fd != -1 )

       FD_SET( dev_fd, &errFds );

     maxFd = 0;

     if( udpSocket > maxFd )

       maxFd = udpSocket;

-    if( dev_fd > maxFd )

+    if( dev_fd != -1 && dev_fd > maxFd )

       maxFd = dev_fd;

-    if( select( maxFd + 1, &readFds, NULL, &errFds, NULL ) < 0 ) // error

-      break;

+    if( use_msecs ) //timeout

+    {

+      gettimeofday( &start, NULL );

+      timeout.tv_sec = msecs / 1000;

+      timeout.tv_usec = msecs % 1000 * 1000;

+      p_timeout = &timeout;

+    }

+    else

+      p_timeout = NULL;

+    if( select( maxFd + 1, &readFds, NULL, &errFds, p_timeout ) < 0 ) //error

+    {

+      printf( "error during select: %s\n", strerror( errno ) );

+      return -1;

+    }

     //error on socket or device

     if( FD_ISSET( udpSocket, &errFds ) )

     {

       printf( "error on socket\n" );

-      break;

+      return -1;

     }

-    if( FD_ISSET( dev_fd, &errFds ) )

+    if( dev_fd != -1 && FD_ISSET( dev_fd, &errFds ) )

     {

+      if( *p_device_output_active )

         printf( "error on device\n" );

       break;

     }

@@ -196,10 +216,10 @@ static void recv_and_out( int udpSocket, int dev_fd,

       if( len < 0 )

       {

         printf( "could not read from socket\n" );

-        break;

+        return -1;

       }

       if( len == 0 )

-        break;

+        return -1;

       //get frame from data

       pFrame = BlinkenFrameFromNetwork( buffer, len, NULL );

@@ -216,34 +236,171 @@ static void recv_and_out( int udpSocket, int dev_fd,

         BlinkenFrameFree( pFrame );

         //output data to device

-        if( len > 0 )

-          write( dev_fd, buffer, len );

+        if( dev_fd != -1 && len > 0 )

+        {

+          if( write( dev_fd, buffer, len ) != len )

+          {

+            if( *p_device_output_active )

+              printf( "error writing to device\n" );

+            break;

+          }

+          //message: output to device was restarted

+          if( ! *p_device_output_active )

+            printf( "restarted output to device...\n" );

+          *p_device_output_active = 1;

+        }

       }

     }

     //received data from device

-    if( FD_ISSET( dev_fd, &readFds ) )

+    if( dev_fd != -1 && FD_ISSET( dev_fd, &readFds ) )

     {

       //read data

       len = read( dev_fd, buffer, sizeof( buffer ) );

       if( len < 0 )

       {

-        printf( "error while reading from device\n" );

+        if( *p_device_output_active )

+          printf( "error reading from device\n" );

         break;

       }

       if( len == 0 )

         dev_eof = 1;

     }

+

+    //using time limit

+    if( use_msecs )

+    {

+      //get time elapsed

+      gettimeofday( &end, NULL );

+      int sec, usec;

+      unsigned int msec;

+      sec = end.tv_sec - start.tv_sec;

+      usec = end.tv_usec - start.tv_usec;

+      if( usec < 0 )

+      {

+        usec += 1000000;

+        sec--;

+      }

+      if( usec < 0 )

+        usec = 0;

+      if( sec < 0 )

+        sec = 0;

+      msec = sec * 1000 + usec / 1000;

+      //more than rest of timeout (or exact match)

+      if( msec >= msecs )

+        break;

+      msecs -= msec;

+    }

+

   } //for( ; ; )

+

+  return 0;

+}

+

+//open device and output frames

+//returns error code (not for device-errors, 0 for success)

+static int open_and_output( int udpSocket, char * device,

+                            int * p_device_output_active,

+                            int serial_settings_change, int serial_settings,

+                            unsigned int format_change,

+                            unsigned int format_height, unsigned int format_width,

+                            unsigned int format_channels, unsigned int format_colors,

+                            etBlinkenProto proto )

+{

+  int dev_fd, err;

+  char txt[64];

+

+  //open device

+  dev_fd = open( device, O_RDWR | O_NOCTTY | O_NONBLOCK );

+  if( dev_fd == -1 )

+  {

+    if( *p_device_output_active )

+      printf( "could not open \"%s\": error: %s\n", device, strerror( errno ) );

+    return 0;

+  }

+

+  //setup serial port

+  if( serial_settings_change )

+  {

+    if( ! serial_settings_set( dev_fd, serial_settings ) )

+    {

+      if( *p_device_output_active )

+      {

+        serial_settings_to_str( serial_settings, txt, sizeof( txt ) );

+        printf( "could not set serial port to \"%s\"\n", txt );

+      }

+      close( dev_fd );

+      return 0;

+    }

+  }

+

+  //receive frames and output to device

+  err = recv_and_out( udpSocket, dev_fd, p_device_output_active,

+                      format_change, format_height, format_width, format_channels, format_colors,

+                      proto, 0, 0 );

+

+  //close device

+  close( dev_fd );

+

+  return err;

+}

+

+//open device and output frames in a loop

+//returns error code (not for device-errors, 0 for success)

+static int open_and_output_loop( int udpSocket, char * device,

+                                 int serial_settings_change, int serial_settings,

+                                 int reopen_device, unsigned int reopen_device_ms,

+                                 unsigned int format_change,

+                                 unsigned int format_height, unsigned int format_width,

+                                 unsigned int format_channels, unsigned int format_colors,

+                                 etBlinkenProto proto )

+{

+  int device_output_active, err;

+

+  printf( "receiving frames and outputting them to \"%s\"...\n", device );

+  device_output_active = 1;

+

+  for( ; ; )

+  {

+

+    //try to open device and output frames

+    err = open_and_output( udpSocket, device,

+                           &device_output_active,

+                           serial_settings_change, serial_settings,

+                           format_change, format_height, format_width, format_channels, format_colors,

+                           proto );

+    if( err != 0 || ! reopen_device )

+      break;

+

+    //output to device stopped

+    if( device_output_active )

+      printf( "output to device stopped...\n" );

+    device_output_active = 0;

+

+    //only fetch data from socket for a short time

+    err = recv_and_out( udpSocket, -1, &device_output_active,

+                        format_change, format_height, format_width, format_channels, format_colors,

+                        proto, 1, reopen_device_ms );

+    if( err != 0 )

+      break;;

+

+  }

+

+  //output to device finshed

+  if( device_output_active )

+    printf( "output to device finished...\n" );

+  device_output_active = 0;

+

+  return err;

 }

 int main( int argCnt, char * * args )

 {

-  int i, udpSocket, bound, val, serial_settings, dev_fd;

+  int i, udpSocket, bound, serial_settings;

   etBlinkenProto proto;

   unsigned int format_change, format_height, format_width, format_channels, format_colors;

-  unsigned int height, width, channels, colors;

-  unsigned int serial_settings_change;

+  unsigned int height, width, channels, colors, reopen_device_ms;

+  int serial_settings_change, reopen_device;

   char txt[64];

   unsigned short port;

   struct sockaddr_in addr;

@@ -251,7 +408,7 @@ int main( int argCnt, char * * args )

   //print info

   printf( "BlinkenLib - BlinkenOutput\n"

-          "version 0.5 date 2005-12-06\n"

+          "version 0.5.1 date 2005-12-14\n"

           "Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>\n"

           "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"

           "a blinkenarea.org project\n\n" );

@@ -263,7 +420,7 @@ int main( int argCnt, char * * args )

             "parameters:\n"

             "  -l [<ip>:]<port>\n"

             "     local address (defaults to 0.0.0.0:2323)\n"

-            "     must occur before -r and -o, may only occur once\n"

+            "     must occur before -r, may only occur once\n"

             "  -r <ip>[:<port>]\n"

             "     remote addess (defaults to every remote address)\n"

             "  -p [BLP|EBLP|MCUF]\n"

@@ -273,7 +430,10 @@ int main( int argCnt, char * * args )

             "  -d <device>\n"

             "     device to output frames to (defaults to \"/dev/null\")\n"

             "  -s <baud-rate>,<parity>,<data-bits>,<stop-bits>\n"

-            "     settings to use for serial devices (defaults to no change)\n\n",

+            "     settings to use for serial devices (defaults to no change)\n"

+            "  -o <milliseconds>\n"

+            "     reopen device after short time on error (defaults to not reopen)\n"

+            "\n",

             args[0] );

     return 0;

   }

@@ -290,8 +450,13 @@ int main( int argCnt, char * * args )

   //process parameters

   proto = BlinkenProtoMcuf;

   format_change = 0;

+  format_height = 0;

+  format_width = 0;

+  format_channels = 0;

+  format_colors = 0;

   device = "/dev/null";

   serial_settings_change = 0;

+  reopen_device = 0;

   for( i = 1; i < argCnt; i++ )

   {

@@ -428,6 +593,21 @@ int main( int argCnt, char * * args )

         printf( "missing serial settings for \"-s\"\n" );

     }

+    //reopen device on error after some time

+    else if( strcmp( args[i], "-o" ) == 0 )

+    {

+      if( i + 1 < argCnt )

+      {

+        i++;

+        if( sscanf( args[i], "%u", &reopen_device_ms ) == 1 && reopen_device_ms >= 1 )

+          reopen_device = 1;

+        else

+          printf( "invalid number of milliseconds \"%s\"\n", args[i] );

+      }

+      else

+        printf( "missing time for \"-o\"\n" );

+    }

+

     //unknown parameter

     else

       printf( "unknown parameter \"%s\", call without parameters to get help\n", args[i] );

@@ -452,36 +632,14 @@ int main( int argCnt, char * * args )

     }

   }

-  //open device

-  dev_fd = open( device, O_RDWR | O_NOCTTY | O_NONBLOCK );

-  if( dev_fd == -1 )

-  {

-    printf( "could not open \"%s\": error: %s\n", device, strerror( errno ) );

-    close( udpSocket );

-    return -1;

-  }

-

-  //setup serial port

-  if( serial_settings_change )

-  {

-    if( ! serial_settings_set( dev_fd, serial_settings ) )

-    {

-      serial_settings_to_str( serial_settings, txt, sizeof( txt ) );

-      printf( "could not set serial port to \"%s\"\n", txt );

-      close( dev_fd );

-      close( udpSocket );

-      return -1;

-    }

-  }

-

-  //recieve frames and output to device

-  printf( "receiving frames and outputting them to \"%s\"...\n", device );

-  recv_and_out( udpSocket, dev_fd,

+  //open device and output frames in a loop

+  open_and_output_loop( udpSocket, device,

+                        serial_settings_change, serial_settings,

+                        reopen_device, reopen_device_ms,

                         format_change, format_height, format_width, format_channels, format_colors,

                         proto );

-  //cleanup

-  close( dev_fd );

+  //close socket

   close( udpSocket );

   return 0;

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -8,6 +8,7 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#include <unistd.h>

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

@@ -25,7 +26,7 @@ int main( int argCnt, char * * args )

   //print info

   printf( "BlinkenLib - BlinkenRecv\n"

-          "version 0.5 date 2005-12-06\n"

+          "version 0.5.1 date 2005-12-14\n"

           "Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>\n"

           "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"

           "a blinkenarea.org project\n\n" );

@@ -130,7 +131,7 @@ int main( int argCnt, char * * args )

       if( i + 1 < argCnt )

       {

         i++;

-        if( sscanf( args[i], "%hu", &val ) == 1 )

+        if( sscanf( args[i], "%u", &val ) == 1 )

           timeout = val;

         else

           printf( "invalid timeout value \"%s\"\n", args[i] );

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -8,6 +8,7 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#include <unistd.h>

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

@@ -27,7 +28,7 @@ int main( int argCnt, char * * args )

   //print info

   printf( "BlinkenLib - BlinkenSend\n"

-          "version 0.5 date 2005-12-06\n"

+          "version 0.5.1 date 2005-12-14\n"

           "Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>\n"

           "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"

           "a blinkenarea.org project\n\n" );

@@ -1,3 +1,7 @@

+0.5.1 2005-12-14

+----------------

+added possibility to reopen device on errors

+

 0.5 2005-12-06

 --------------

 added BlinkenOutput to output streams to devices

@@ -1,5 +1,5 @@

 # BlinkenLib

-# version 0.5 date 2005-12-06

+# version 0.5.1 date 2005-12-14

 # Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

 # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 # a blinkenarea.org project

@@ -28,17 +28,29 @@ BlinkenLib.a: BlinkenFrame.o BlinkenMovie.o Tools.o

 	$(AR) $(ARFLAGS) BlinkenLib.a BlinkenFrame.o BlinkenMovie.o Tools.o

 	$(RANLIB) BlinkenLib.a

-BlinkenConv: BlinkenConv.c BlinkenLib.h BlinkenLib.a

-	$(CC) $(LFLAGS) -o BlinkenConv BlinkenConv.c BlinkenLib.a

+BlinkenConv.o: BlinkenConv.c BlinkenLib.h

+	$(CC) $(CFLAGS) -c -o BlinkenConv.o BlinkenConv.c

-BlinkenSend: BlinkenSend.c BlinkenLib.h BlinkenLib.a

-	$(CC) $(LFLAGS) -o BlinkenSend BlinkenSend.c BlinkenLib.a

+BlinkenConv: BlinkenConv.o BlinkenLib.a

+	$(CC) $(LFLAGS) -o BlinkenConv BlinkenConv.o BlinkenLib.a

-BlinkenRecv: BlinkenRecv.c BlinkenLib.h BlinkenLib.a

-	$(CC) $(LFLAGS) -o BlinkenRecv BlinkenRecv.c BlinkenLib.a

+BlinkenSend.o: BlinkenSend.c BlinkenLib.h

+	$(CC) $(CFLAGS) -c -o BlinkenSend.o BlinkenSend.c

-BlinkenOutput: BlinkenOutput.c BlinkenLib.h BlinkenLib.a

-	$(CC) $(LFLAGS) -o BlinkenOutput BlinkenOutput.c BlinkenLib.a

+BlinkenSend: BlinkenSend.o BlinkenLib.a

+	$(CC) $(LFLAGS) -o BlinkenSend BlinkenSend.o BlinkenLib.a

+

+BlinkenRecv.o: BlinkenRecv.c BlinkenLib.h

+	$(CC) $(CFLAGS) -c -o BlinkenRecv.o BlinkenRecv.c

+

+BlinkenRecv: BlinkenRecv.o BlinkenLib.a

+	$(CC) $(LFLAGS) -o BlinkenRecv BlinkenRecv.o BlinkenLib.a

+

+BlinkenOutput.o: BlinkenOutput.c BlinkenLib.h

+	$(CC) $(CFLAGS) -c -o BlinkenOutput.o BlinkenOutput.c

+

+BlinkenOutput: BlinkenOutput.o BlinkenLib.a

+	$(CC) $(LFLAGS) -o BlinkenOutput BlinkenOutput.o BlinkenLib.a

 clean:

 	rm -f *.o BlinkenLib.a BlinkenConv BlinkenSend BlinkenRecv BlinkenOutput

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLib

- * version 0.5 date 2005-12-06

+ * version 0.5.1 date 2005-12-14

  * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project