JEtherPix

@@ -14,14 +14,10 @@

 #

 # You should have received a copy of the GNU Lesser General Public License

 # along with this program. If not, see <http://www.gnu.org/licenses/>.

-# BlinkenLightsInteractiveMovieProgram

-# Copyright (C) 2004-2011: Stefan Schuermans <stefan@schuermans.info>

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

-# a blinkenarea.org project

-

-VERSION_MAJOR=0

-VERSION_MINOR=1

-VERSION_REVISION=2

+

+VERSION_MAJOR=1

+VERSION_MINOR=2

+VERSION_REVISION=0

 JAVAC=javac

 JAR=jar

@@ -110,9 +110,9 @@ class Config

   void procDistriAddr(String settingPart2, String value)

     throws Exception

   {

-    int dist;

+    int dist, addr_cnt, addr_i;

     Distri distri;

-    InetSocketAddress addr;

+    InetSocketAddress [] addrs;

     // get distributor number

     try {

@@ -130,14 +130,31 @@ class Config

       errorExc(String.format("no distributor with number \"%d\"" +

                              " in line %d of config file", dist, m_lineNo));

-    // get address

-    addr = AddrParser.parseAddr(value);

-    if (addr == null) {

+    // check if maximum number of addresses reached

+    if (distri.m_addrs != null &&

+        distri.m_addrs.length > Constants.addrMaxCnt) {

+      errorExc(String.format("too many addresses (\"%s\") for distributor" +

+                             " with number \"%u\" in line %u of config file\n",

+                             value, dist, m_lineNo));

+    }

+

+    // get address andd add it to distributor

+    if (distri.m_addrs != null) {

+      addr_cnt = distri.m_addrs.length;

+    } else {

+      addr_cnt = 0;

+    }

+    addrs = new InetSocketAddress [addr_cnt + 1];

+    for (addr_i = 0; addr_i < addr_cnt; ++addr_i) {

+      addrs[addr_i] = distri.m_addrs[addr_i];

+    }

+    addrs[addr_cnt] = AddrParser.parseAddr(value);

+    if (addrs[addr_cnt] == null) {

       errorExc("invalid addess \"" + value +

                "\" for distributor with number \"%u\"" +

                String.format(" in line %d of config file", m_lineNo));

     }

-    distri.m_addr = addr;

+    distri.m_addrs = addrs;

   }

   /**

@@ -427,6 +444,22 @@ class Config

     procSetting(setting, value);

   }

+  /**

+   * @brief set default addresses of distributors

+   */

+  void setDefDistriAddrs()

+  {

+    int i;

+    Distri distri;

+

+    for (i = 0; i < m_display.m_distris.length; ++i) {

+      distri = m_display.m_distris[i];

+      if (distri != null) {

+        distri.addrDef();

+      }

+    }

+  }

+

   /**

    * @brief process config file

    *

@@ -465,6 +498,9 @@ class Config

     br.close();

     fr.close();

+    // set default addresses of distributors

+    setDefDistriAddrs();

+

     info(String.format("%dx%d input format, ", m_display.m_size.m_x,

                                                m_display.m_size.m_y) +

          String.format("%d distributors, ",    m_display.m_distriCnt ) +

@@ -26,6 +26,8 @@ class Constants

                                    *   that can be in the system,

                                    *   number of distributor addresses

                                    *   available */

+  static int addrMaxCnt   =    8; /**< maximum number of network address(es)

+                                   *   for a distributor */

   static int outputMaxCnt =  128; /**< maximum number of outputs per

                                    *   distributor */

   static int pixelMaxCnt  = 1024; /**< maximum number of pixels that can

@@ -160,7 +160,7 @@ public class Display

   /// send image data to distributors

   public void send()

   {

-    int dist;

+    int dist, addr_i;

     Distri distri;

     // send data to all distributors

@@ -168,15 +168,17 @@ public class Display

       distri = m_distris[dist];

       if (distri != null) {

-        if (distri.m_addr != null) {

+        if (distri.m_addrs != null) {

+          // send message as UDP packet to each address

+          for (addr_i = 0; addr_i < distri.m_addrs.length; ++addr_i) {

             try {

-            // send message as UDP packet

               DatagramPacket pack = new DatagramPacket(distri.m_msgBuf,

                                                        distri.m_msgBuf.length,

-                                                     distri.m_addr);

+                                                       distri.m_addrs[addr_i]);

               m_sock.send(pack);

             } catch (java.io.IOException e) {

             }

+          } // for addr_i

         }

       } // if distri

@@ -37,22 +37,6 @@ class Distri

     m_outputCnt = outputCnt;

     m_pixelCnt  = pixelCnt;

-    // initialize address to default

-    try {

-      int intIp = Constants.destIpBase +

-                  m_distri * Constants.destIpStep;

-      byte [] byteIp = {

-        (byte)(intIp >> 24),

-        (byte)(intIp >> 16),

-        (byte)(intIp >>  8),

-        (byte)intIp

-      };

-      m_addr = new InetSocketAddress(InetAddress.getByAddress(byteIp),

-                                     Constants.destPort);

-    } catch (java.io.IOException e) {

-      m_addr = null;

-    }

-

     // allocate default mappings

     m_mapRed   = new Mapping();

     m_mapGreen = new Mapping();

@@ -71,10 +55,36 @@ class Distri

     m_msgBuf[Constants.mcufOfsPixelsU16 + 1]  = (byte)m_pixelCnt;

   }

+  /**

+   * @brief initialize address to default if no address is set

+   */

+  void addrDef()

+  {

+    if (m_addrs == null) {

+      try {

+        int intIp = Constants.destIpBase +

+                    m_distri * Constants.destIpStep;

+        byte [] byteIp = {

+          (byte)(intIp >> 24),

+          (byte)(intIp >> 16),

+          (byte)(intIp >>  8),

+          (byte)intIp

+        };

+        m_addrs = new InetSocketAddress[1];

+        m_addrs[0] = new InetSocketAddress(InetAddress.getByAddress(byteIp),

+                                           Constants.destPort);

+      } catch (java.io.IOException e) {

+        m_addrs = null;

+      }

+    }

+  }

+

   int               m_distri;    ///< number of this distributor

   int               m_outputCnt; ///< number of outputs

   int               m_pixelCnt;  ///< number pixels connected to every output

-  InetSocketAddress m_addr;      ///< network address of distributor

+  InetSocketAddress [] m_addrs;  /**< network address(es) of distributor,

+                                      multiple addresses mean the packets are

+                                      sent to each address */

   Mapping           m_mapRed;    ///< mapping information for red channel

   Mapping           m_mapGreen;  ///< mapping information for Green channel

   Mapping           m_mapBlue;   ///< mapping information for blue channel