libetherpix

@@ -17,8 +17,8 @@

 LIBTARGET := libetherpix

 VER_MAJ   := 1

-VER_MIN   := 1

-VER_REV   := 1

+VER_MIN   := 2

+VER_REV   := 0

 VERSION   := $(VER_MAJ).$(VER_MIN).$(VER_REV)

 SRCS    := $(wildcard src/*.c)

@@ -25,6 +25,8 @@

                                    *   that can be in the system,

                                    *   number of distributor addresses

                                    *   available */

+#define ETP_DISTRI_MAX_ADDRS (8)  /**< maximum number of network address(es)

+                                       for a distributor */

 #define ETP_OUTPUT_MAX_CNT (128)  /**< maximum number of outputs per

                                    *   distributor */

 #define ETP_PIXEL_MAX_CNT  (1024) /**< maximum number of pixels that can

@@ -48,8 +48,12 @@ typedef struct etp_pixel_s {

 typedef struct etp_distri_s {

   unsigned int distri;        /**< number of this distributor */

   unsigned int output_cnt;    /**< number of outputs of this distributor */

-  unsigned int pixel_cnt;   /**< number of pixels connected to every output */

-  struct sockaddr_in addr;  /**< network address of distributor */

+  unsigned int pixel_cnt;     /**< number of pixels connected to each output */

+  unsigned int addr_cnt;      /**< number of network addresses */

+  struct sockaddr_in addrs

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

+                               *   multiple addresses mean the packets are

+                               *   sent to each address */

   etp_mapping_t mapping[3];   /**< mapping information for red, green

                                *   and blue channel */

   etp_pixel_t *p_pixels;      /**< array with information about pixels

@@ -108,11 +108,8 @@ int etp_config_proc_distri(etp_config_ctx_t *p_ctx, char *p_setting_part2,

   p_distri->distri = distri;

   p_distri->output_cnt = out;

   p_distri->pixel_cnt = pix;

-  /* initialize address to default */

-  p_distri->addr.sin_family = AF_INET;

-  p_distri->addr.sin_addr.s_addr = htonl(ETP_DEST_IP_BASE +

-                                         p_distri->distri * ETP_DEST_IP_STEP);

-  p_distri->addr.sin_port = htons(ETP_DEST_PORT);

+  /* no network address yet */

+  p_distri->addr_cnt = 0;

   /* initialize mapping information */

   for (i = 0; i < 3; i++) {

     p_distri->mapping[i].base = 0.0;

@@ -205,8 +202,18 @@ int etp_config_proc_distri_addr(etp_config_ctx_t *p_ctx, char *p_setting_part2,

     return -1;

   }

-  /* get address */

-  if (etp_parse_addr(p_value, &p_distri->addr)) {

+  /* check if maximum number of addresses reached */

+  if (p_distri->addr_cnt >= ETP_DISTRI_MAX_ADDRS) {

+    if (p_ctx->p_msg_func)

+      p_ctx->p_msg_func(p_ctx->p_msg_ctx, etp_msg_type_err,

+                        "too many addresses (\"%s\") for distributor with"

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

+                        p_value, distri, p_ctx->line_no);

+    return -1;

+  }

+

+  /* get address and add it to distributor */

+  if (etp_parse_addr(p_value, &p_distri->addrs[p_distri->addr_cnt])) {

     if (p_ctx->p_msg_func)

       p_ctx->p_msg_func(p_ctx->p_msg_ctx, etp_msg_type_err,

                         "invalid address \"%s\" for distributor with number"

@@ -214,6 +221,7 @@ int etp_config_proc_distri_addr(etp_config_ctx_t *p_ctx, char *p_setting_part2,

                         p_value, distri, p_ctx->line_no);

     return -1;

   }

+  ++p_distri->addr_cnt;

   return 0;

 }

@@ -636,6 +644,33 @@ int etp_config_proc_line(etp_config_ctx_t *p_ctx, char *p_line)

   return etp_config_proc_setting(p_ctx, p_setting, p_value);

 }

+/**

+ * \brief set default addresses of distributors

+ * \param[in,out] p_ctx context information

+ */

+static void etp_config_set_def_distri_addrs(etp_config_ctx_t *p_ctx)

+{

+  unsigned int distri;

+  etp_distri_t *p_distri;

+

+  /* set default addresses of distributors */

+  for (distri = 0; distri < ETP_DISTRI_MAX_CNT; distri++) {

+    p_distri = p_ctx->p_display->distri_ptrs[distri];

+    if (p_distri) {

+

+      /* no address yet -> use default */

+      if (p_distri->addr_cnt == 0) {

+        p_distri->addr_cnt = 1;

+        p_distri->addrs[0].sin_family = AF_INET;

+        p_distri->addrs[0].sin_addr.s_addr =

+            htonl(ETP_DEST_IP_BASE + p_distri->distri * ETP_DEST_IP_STEP);

+        p_distri->addrs[0].sin_port = htons(ETP_DEST_PORT);

+      }

+

+    }  // if (p_distri)

+  } // for (distri ...)

+}

+

 /**

  * \brief process config file

  *

@@ -720,6 +755,9 @@ int etp_config_proc_file(etp_display_t *p_display,

   /* close file */

   fclose(file);

+  /* set default addresses of distributors */

+  etp_config_set_def_distri_addrs(&ctx);

+

   if (p_msg_func)

     p_msg_func(p_msg_ctx, etp_msg_type_info,

                "%ux%u input format, %u distributors, %u outputs, %lu pixels\n",

@@ -275,7 +275,7 @@ void etp_display_data(etp_display_t *p_display, etp_u8_t *p_data,

  */

 void etp_display_send(etp_display_t *p_display)

 {

-  unsigned int distri;

+  unsigned int distri, addr_i;

   etp_distri_t *p_distri;

   /* send data to all distributors */

@@ -283,9 +283,13 @@ void etp_display_send(etp_display_t *p_display)

     p_distri = p_display->distri_ptrs[distri];

     if (p_distri) {

-      /* send message as UDP packet */

-      sendto(p_display->sock, (char *)p_distri->p_msg_buf, p_distri->msg_len,

-             0, (struct sockaddr *)&p_distri->addr, sizeof (p_distri->addr));

+      /* send message as UDP packet to each address */

+      for (addr_i = 0; addr_i < p_distri->addr_cnt; ++addr_i) {

+        sendto(p_display->sock,

+               (char *)p_distri->p_msg_buf, p_distri->msg_len, 0,

+               (struct sockaddr *)&p_distri->addrs[addr_i],

+               sizeof (p_distri->addrs[addr_i]));

+      } /* for (addr_i ...) */

     } /* if (p_distri) */

   } /* for (distri ...) */