Index: uspace/app/pcapctl/main.c =================================================================== --- uspace/app/pcapctl/main.c (revision 78edb5e7bafe392fff14634b826f857ea1745cb1) +++ uspace/app/pcapctl/main.c (revision 8d9217d344740c9fa41e04a85b090a0b3b82a55b) @@ -40,4 +40,5 @@ #define NAME "pcapctl" +#define DEFAULT_DEV_NUM 0 //pcapctl_sess_t* sess = NULL; @@ -45,5 +46,5 @@ static errno_t start_dumping(const char *svc_name, const char *name) { - pcapctl_sess_t* sess = NULL; + pcapctl_sess_t *sess = NULL; errno_t rc = pcapctl_dump_open(svc_name, &sess); if (rc != EOK) { @@ -59,5 +60,5 @@ static errno_t stop_dumping(const char *svc_name) { - pcapctl_sess_t* sess = NULL; + pcapctl_sess_t *sess = NULL; errno_t rc = pcapctl_dump_open(svc_name, &sess); if (rc != EOK) { @@ -69,5 +70,6 @@ } -static void list_devs(void) { +static void list_devs(void) +{ pcapctl_list(); } @@ -76,14 +78,14 @@ { printf("Usage:\n" - NAME " list \n" - "\tList of devices\n" - NAME " start --device= | -d \n" - "\tPackets dumped from device will be written to \n" - NAME " stop --device= | -d \n" - "\tDumping from stops\n" - NAME " start \n" - "\tPackets dumped from the 1st device from the list will be written to \n" - NAME " --help | -h\n" - "\tShow this application help.\n"); + NAME " list \n" + "\tList of devices\n" + NAME " start --device= | -d \n" + "\tPackets dumped from device will be written to \n" + NAME " stop --device= | -d \n" + "\tDumping from stops\n" + NAME " start \n" + "\tPackets dumped from the 1st device from the list will be written to \n" + NAME " --help | -h\n" + "\tShow this application help.\n"); } @@ -94,19 +96,18 @@ return 1; } else { - /** help*/ + /** help */ if (str_cmp(argv[1], "--help") == 0 || str_cmp(argv[1], "-h") == 0) { usage(); return 0; - /** list*/ + /** list */ } else if (str_cmp(argv[1], "list") == 0) { list_devs(); return 0; - /** start with/out devnum */ + /** start with/out devnum */ } else if (str_cmp(argv[1], "start") == 0) { if (argc == 3) { start_dumping((char *)"0", argv[2]); return 0; - } - else if (argc == 4) { + } else if (argc == 4) { start_dumping(argv[2], argv[3]); return 0; @@ -115,5 +116,5 @@ return 1; } - /** Stop with/out devnum */ + /** Stop with/out devnum */ } else if (str_cmp(argv[1], "stop") == 0) { if (argc == 2) { @@ -121,6 +122,5 @@ fprintf(stdout, "Dumping was stopped\n"); return 0; - } - else if (argc == 3) { + } else if (argc == 3) { stop_dumping(argv[2]); Index: uspace/drv/nic/e1k/e1k.c =================================================================== --- uspace/drv/nic/e1k/e1k.c (revision 78edb5e7bafe392fff14634b826f857ea1745cb1) +++ uspace/drv/nic/e1k/e1k.c (revision 8d9217d344740c9fa41e04a85b090a0b3b82a55b) @@ -2202,18 +2202,22 @@ goto err_fun_bind; - rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC); - if (rc != EOK) - goto err_add_to_cat; - - rc = ddf_fun_add_to_category(fun, "pcap"); + // rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC); + // if (rc != EOK) + // goto err_add_to_cat; + + // rc = ddf_fun_add_to_category(fun, "pcap"); + // if (rc != EOK) { + // ddf_msg(LVL_ERROR, "Failed adding function to category pcap"); + // goto err_add_to_cat; + // } + rc = nic_fun_add_to_cats(fun); if (rc != EOK) { - ddf_msg(LVL_ERROR, "Failed adding function to category pcap"); - goto err_add_to_cat; - } - + ddf_msg(LVL_ERROR, "Failed adding function to categories"); + return rc; + } return EOK; -err_add_to_cat: - ddf_fun_unbind(fun); + // err_add_to_cat: + // ddf_fun_unbind(fun); err_fun_bind: err_rx_structure: Index: uspace/drv/nic/ne2k/ne2k.c =================================================================== --- uspace/drv/nic/ne2k/ne2k.c (revision 78edb5e7bafe392fff14634b826f857ea1745cb1) +++ uspace/drv/nic/ne2k/ne2k.c (revision 8d9217d344740c9fa41e04a85b090a0b3b82a55b) @@ -449,4 +449,11 @@ return rc; } + rc = ddf_fun_add_to_category(fun, "pcap"); + if (rc != EOK) { + //ddf_msg(LVL_ERROR, "Failed adding function to category pcap"); + ddf_fun_unbind(fun); + ddf_fun_destroy(fun); + return rc; + } return EOK; Index: uspace/drv/nic/rtl8139/driver.c =================================================================== --- uspace/drv/nic/rtl8139/driver.c (revision 78edb5e7bafe392fff14634b826f857ea1745cb1) +++ uspace/drv/nic/rtl8139/driver.c (revision 8d9217d344740c9fa41e04a85b090a0b3b82a55b) @@ -42,4 +42,5 @@ #include #include +#include #include "defs.h" @@ -1313,4 +1314,10 @@ } + rc = ddf_fun_add_to_category(fun, "pcap"); + if (rc != EOK) { + ddf_msg(LVL_ERROR, "Failed adding function to category pcap"); + goto err_fun_bind; + } + ddf_msg(LVL_NOTE, "The %s device has been successfully initialized.", ddf_dev_get_name(dev)); Index: uspace/lib/nic/include/nic.h =================================================================== --- uspace/lib/nic/include/nic.h (revision 78edb5e7bafe392fff14634b826f857ea1745cb1) +++ uspace/lib/nic/include/nic.h (revision 8d9217d344740c9fa41e04a85b090a0b3b82a55b) @@ -282,4 +282,6 @@ extern pcap_iface_t *nic_get_pcap_iface(nic_t *); +extern errno_t nic_fun_add_to_cats(ddf_fun_t *fun); + #endif // __NIC_H__ Index: uspace/lib/nic/src/nic_impl.c =================================================================== --- uspace/lib/nic/src/nic_impl.c (revision 78edb5e7bafe392fff14634b826f857ea1745cb1) +++ uspace/lib/nic/src/nic_impl.c (revision 8d9217d344740c9fa41e04a85b090a0b3b82a55b) @@ -844,4 +844,23 @@ } +errno_t nic_fun_add_to_cats(ddf_fun_t *fun) +{ + errno_t rc; + rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC); + if (rc != EOK) + goto err_add_to_cat; + + rc = ddf_fun_add_to_category(fun, "pcap"); + if (rc != EOK) { + //ddf_msg(LVL_ERROR, "Failed adding function to category pcap"); + goto err_add_to_cat; + } + return EOK; + +err_add_to_cat: + ddf_fun_unbind(fun); + return rc; +} + /** @} */ Index: uspace/lib/pcap/include/pcapctl_dump.h =================================================================== --- uspace/lib/pcap/include/pcapctl_dump.h (revision 78edb5e7bafe392fff14634b826f857ea1745cb1) +++ uspace/lib/pcap/include/pcapctl_dump.h (revision 8d9217d344740c9fa41e04a85b090a0b3b82a55b) @@ -55,5 +55,4 @@ extern errno_t pcapctl_list(void); - #endif Index: uspace/lib/pcap/src/pcapctl_dump.c =================================================================== --- uspace/lib/pcap/src/pcapctl_dump.c (revision 78edb5e7bafe392fff14634b826f857ea1745cb1) +++ uspace/lib/pcap/src/pcapctl_dump.c (revision 8d9217d344740c9fa41e04a85b090a0b3b82a55b) @@ -45,5 +45,6 @@ //static service_id_t *pcap_svcs = NULL; ?? -static errno_t str2num(const char* str, size_t* number) { +static errno_t str2num(const char *str, size_t *number) +{ size_t num = 0; if (*str == 0) @@ -68,5 +69,6 @@ } -static errno_t pcapctl_cat_get_svc(const char *drv_name, service_id_t* svc) { +static errno_t pcapctl_cat_get_svc(const char *drv_name, service_id_t *svc) +{ errno_t rc; category_id_t pcap_cat; @@ -98,6 +100,6 @@ } -extern errno_t pcapctl_list(void) { - +errno_t pcapctl_list(void) +{ errno_t rc; category_id_t pcap_cat; @@ -118,5 +120,5 @@ } - fprintf(stdout, "Services:\n"); + fprintf(stdout, "Devices:\n"); for (unsigned i = 0; i < count; ++i) { char *name = NULL; @@ -128,7 +130,6 @@ } - -static errno_t pcapctl_get_name_from_number(const char* svcnum, const char** svcname) { - +static errno_t pcapctl_get_name_from_number(const char *svcnum, const char **svcname) +{ errno_t rc; category_id_t pcap_cat; @@ -183,6 +184,5 @@ return ENOMEM; - - const char* svcname; + const char *svcname; rc = pcapctl_get_name_from_number(svcnum, &svcname);