Changes in uspace/app/nic/nic.c [278fede:6bcecc2] in mainline

File:

• uspace/app/nic/nic.c (modified) (10 diffs)

uspace/app/nic/nic.c

@@ -45 +45 @@
 
 typedef struct {
-        nic_device_info_t device_info;
         nic_address_t address;
         nic_cable_state_t link_state;
-        nic_channel_mode_t duplex;
-        int speed;
 } nic_info_t;
 
@@ -55 +52 @@
 {
         printf("syntax:\n");
-        printf("\t" NAME " [<index> <cmd> [<args...>]]\n");
-        printf("\t<index> is NIC index number reported by the tool\n");
-        printf("\t<cmd> is:\n");
-        printf("\taddr <mac_address> - set MAC address\n");
-        printf("\tspeed <10|100|1000> - set NIC speed\n");
-        printf("\tduplex <half|full> - set duplex mode\n");
-}
-
-static async_sess_t *get_nic_by_index(size_t i)
-{
-        int rc;
-        size_t count;
-        char *svc_name;
-        category_id_t nic_cat;
-        service_id_t *nics = NULL;
-        async_sess_t *sess;
-
-        rc = loc_category_get_id("nic", &nic_cat, 0);
-        if (rc != EOK) {
-                printf("Error resolving category 'nic'.\n");
-                goto error;
-        }
-
-        rc = loc_category_get_svcs(nic_cat, &nics, &count);
-        if (rc != EOK) {
-                printf("Error getting list of NICs.\n");
-                goto error;
-        }
-
-        rc = loc_service_get_name(nics[i], &svc_name);
-        if (rc != EOK) {
-                printf("Error getting service name.\n");
-                goto error;
-        }
-
-        printf("Using device: %s\n", svc_name);
-
-        sess = loc_service_connect(EXCHANGE_SERIALIZE, nics[i], 0);
-        if (sess == NULL) {
-                printf("Error connecting to service.\n");
-                goto error;
-        }
-
-        return sess;
-error:
-        return NULL;
+        printf("\t" NAME "\n");
 }
 
@@ -107 +59 @@
 {
         async_sess_t *sess;
-        nic_role_t role;
         int rc;
 
         sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id, 0);
         if (sess == NULL) {
-                printf("Error connecting to service.\n");
+                printf("Error connecting '%s'.\n", svc_name);
+                rc = EIO;
                 goto error;
         }
@@ -123 +75 @@
         }
 
-        rc = nic_get_device_info(sess, &info->device_info);
-        if (rc != EOK) {
-                printf("Error getting NIC device info.\n");
-                rc = EIO;
-                goto error;
-        }
-
         rc = nic_get_cable_state(sess, &info->link_state);
         if (rc != EOK) {
@@ -136 +81 @@
                 goto error;
         }
-
-        rc = nic_get_operation_mode(sess, &info->speed, &info->duplex, &role);
-        if (rc != EOK) {
-                printf("Error getting NIC speed and duplex mode.\n");
-                rc = EIO;
-                goto error;
-        }
-
 
         return EOK;
@@ -156 +93 @@
         case NIC_CS_PLUGGED: return "up";
         case NIC_CS_UNPLUGGED: return "down";
-        default: assert(false); return NULL;
-        }
-}
-
-static const char *nic_duplex_mode_str(nic_channel_mode_t mode)
-{
-        switch (mode) {
-        case NIC_CM_FULL_DUPLEX: return "full-duplex";
-        case NIC_CM_HALF_DUPLEX: return "half-duplex";
-        case NIC_CM_SIMPLEX: return "simplex";
         default: assert(false); return NULL;
         }
@@ -206 +133 @@
         }
 
-        printf("[Service Name]\n");
+        printf("[Address] [Link State] [Service Name]\n");
         for (i = 0; i < count; i++) {
                 rc = loc_service_get_name(nics[i], &svc_name);
@@ -225 +152 @@
                 }
 
-                printf("%d: %s\n", i, svc_name);
-                printf("\tMAC address: %s\n", addr_str);
-                printf("\tVendor name: %s\n",
-                    nic_info.device_info.vendor_name);
-                printf("\tModel name: %s\n",
-                    nic_info.device_info.model_name);
-                printf("\tLink state: %s\n",
-                    nic_link_state_str(nic_info.link_state));
-
-                if (nic_info.link_state == NIC_CS_PLUGGED) {
-                        printf("\tSpeed: %dMbps %s\n", nic_info.speed,
-                            nic_duplex_mode_str(nic_info.duplex));
-                }
+                printf("%s %s %s\n", addr_str,
+                    nic_link_state_str(nic_info.link_state), svc_name);
 
                 free(svc_name);
@@ -249 +165 @@
 }
 
-static int nic_set_speed(int i, char *str)
-{
-        async_sess_t *sess;
-        uint32_t speed;
-        int oldspeed;
-        nic_channel_mode_t oldduplex;
-        nic_role_t oldrole;
-        int rc;
-
-        rc = str_uint32_t(str, NULL, 10, false, &speed);
-        if (rc != EOK) {
-                printf("Speed must be a numeric value.\n");
-                return rc;
-        }
-
-        if (speed != 10 && speed != 100 && speed != 1000) {
-                printf("Speed must be one of: 10, 100, 1000.\n");
-                return EINVAL;
-        }
-
-        sess = get_nic_by_index(i);
-        if (sess == NULL) {
-                printf("Specified NIC doesn't exist or cannot connect to it.\n");
-                return EINVAL;
-        }
-
-        rc = nic_get_operation_mode(sess, &oldspeed, &oldduplex, &oldrole);
-        if (rc != EOK) {
-                printf("Error getting NIC speed and duplex mode.\n");
-                return EIO;
-        }
-
-        return nic_set_operation_mode(sess, speed, oldduplex, oldrole);
-}
-
-static int nic_set_duplex(int i, char *str)
-{
-        async_sess_t *sess;
-        int oldspeed;
-        nic_channel_mode_t duplex = NIC_CM_UNKNOWN;
-        nic_channel_mode_t oldduplex;
-        nic_role_t oldrole;
-        int rc;
-
-        if (!str_cmp(str, "half"))
-                duplex = NIC_CM_HALF_DUPLEX;
-
-        if (!str_cmp(str, "full"))
-                duplex = NIC_CM_FULL_DUPLEX;
-
-        if (!str_cmp(str, "simplex"))
-                duplex = NIC_CM_SIMPLEX;
-
-        if (duplex == NIC_CM_UNKNOWN) {
-                printf("Invalid duplex specification.\n");
-                return EINVAL;
-        }
-
-        sess = get_nic_by_index(i);
-        if (sess == NULL) {
-                printf("Specified NIC doesn't exist or cannot connect to it.\n");
-                return EINVAL;
-        }
-
-        rc = nic_get_operation_mode(sess, &oldspeed, &oldduplex, &oldrole);
-        if (rc != EOK) {
-                printf("Error getting NIC speed and duplex mode.\n");
-                return EIO;
-        }
-
-        return nic_set_operation_mode(sess, oldspeed, duplex, oldrole);
-}
-
-static int nic_set_addr(int i, char *str)
-{
-        async_sess_t *sess;
-        nic_address_t addr;
-        int rc, idx;
-
-        sess = get_nic_by_index(i);
-        if (sess == NULL) {
-                printf("Specified NIC doesn't exist or cannot connect to it.\n");
-                return EINVAL;
-        }
-
-        if (str_size(str) != 17) {
-                printf("Invalid MAC address specified");
-                return EINVAL;
-        }
-
-        for (idx = 0; idx < 6; idx++) {
-                rc = str_uint8_t(&str[idx * 3], NULL, 16, false, &addr.address[idx]);
-                if (rc != EOK) {
-                        printf("Invalid MAC address specified");
-                        return EINVAL;
-                }
-        }
-
-        return nic_set_address(sess, &addr);
-}
-
 int main(int argc, char *argv[])
 {
         int rc;
-        uint32_t index;
 
         if (argc == 1) {
@@ -359 +173 @@
                 if (rc != EOK)
                         return 1;
-        } else if (argc >= 3) {
-                rc = str_uint32_t(argv[1], NULL, 10, false, &index);
-                if (rc != EOK) {
-                        printf(NAME ": Invalid argument.\n");
-                        print_syntax();
-                        return 1;
-                }
-
-                if (!str_cmp(argv[2], "addr"))
-                        return nic_set_addr(index, argv[3]);
-
-                if (!str_cmp(argv[2], "speed"))
-                        return nic_set_speed(index, argv[3]);
-
-                if (!str_cmp(argv[2], "duplex"))
-                        return nic_set_duplex(index, argv[3]);
-
         } else {
                 printf(NAME ": Invalid argument.\n");