Changeset 264

Timestamp:

04/14/11 21:04:23 (13 months ago)

Author:

marek

Message:

ap51-flash: show some more output in non-debug mode

Signed-off-by: Marek Lindner <lindner_marek@…>

Location:

ap51-flash-ng

Files:

• proto.c (modified) (4 diffs)
• router_types.c (modified) (2 diffs)

ap51-flash-ng/proto.c

@@ -255 +255 @@
                                 node->image_state.flash_size = node->router_type->image->ci_info.kernel_fsize;
                                 node->image_state.offset = node->router_type->image->ci_info.kernel_offset;
-#if defined(DEBUG)
+
                                 fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: tftp client asks for '%s', serving kernel portion of: %s (%i blocks) ...\n",
                                         node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
@@ -261 +261 @@
                                         node->router_type->desc, file_name, node->router_type->image->path,
                                         ((node->image_state.flash_size + TFTP_PAYLOAD_SIZE - 1) / TFTP_PAYLOAD_SIZE));
-#endif
                         } else {
                                 node->image_state.file_size = node->router_type->image->ci_info.rootfs_size;
                                 node->image_state.flash_size = node->router_type->image->ci_info.rootfs_fsize;
                                 node->image_state.offset = node->router_type->image->ci_info.rootfs_offset;
-#if defined(DEBUG)
+
                                 fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: tftp client asks for '%s', serving rootfs portion of: %s (%i blocks) ...\n",
                                         node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
@@ -272 +271 @@
                                         node->router_type->desc, file_name, node->router_type->image->path,
                                         ((node->image_state.flash_size + TFTP_PAYLOAD_SIZE - 1) / TFTP_PAYLOAD_SIZE));
-#endif
                         }
                         break;
                 case FLASH_MODE_TFTP_CLIENT:
-#if defined(DEBUG)
                         fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: tftp client asks for '%s', serving: %s (%i blocks) ...\n",
                                 node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
@@ -282 +279 @@
                                 node->router_type->desc, file_name, node->router_type->image->path,
                                 ((node->router_type->image->flash_size + TFTP_PAYLOAD_SIZE - 1) / TFTP_PAYLOAD_SIZE));
-#endif
                         break;
                 }

ap51-flash-ng/router_types.c

@@ -84 +84 @@
                 /* we detected a router that we have no image for */
                 if ((*router_type)->image->file_size < 1) {
-#if defined(DEBUG)
                         fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: is of type '%s' that we have no image for\n",
                                 node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
                                 node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
                                 (*router_type)->desc);
-#endif
+
                         node->status = NODE_STATUS_NO_FLASH;
                         ret = 0;
@@ -99 +98 @@
                 node->router_priv = priv;
 
-#if defined(DEBUG)
                 fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: type '%s' detected\n",
                         node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
                         node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
                         node->router_type->desc);
-#endif
 
                 if (!(*router_type)->detect_post)