Skip to content

exact-capture: fix device ID parsing #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

exact-capture: fix device ID parsing #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions src/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,8 @@ void print_flags(uint8_t flags)

int parse_device_id(const char *str, int* dev_number)
{
char* p;

p = strchr(str, ':');
if (p == NULL){
return -1;
}

if ((p - str) >= 16){
return -1;
}

*dev_number = strtol(p - 1, NULL, 10);

return 0;
int ret = sscanf(str, "exanic%d", dev_number);
return ret < 1;
}


Expand Down Expand Up @@ -107,20 +95,15 @@ int parse_device (const char* interface,
{
if(!exanic_find_port_by_interface_name (interface, device, 16, port_number))
{
parse_device_id(device, dev_number);
return 0;
return parse_device_id(device, dev_number);
}

if(!parse_device_port (interface, device, port_number))
{
parse_device_id(device, dev_number);
return 0;

return parse_device_id(device, dev_number);
}

return 1;


}


Expand Down