dect
/
libpcap
Archived
13
0
Fork 0
Code Releases Activity

From Paolo Abeni: the USB setup header is defined in the USB 

specification with a specific layout; use that layout.
This commit is contained in:
guy 2006-10-11 09:22:27 +00:00
parent de2b502289
commit efab3781c8
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcap-usb-linux.c
View File

@ -228,8 +228,8 @@ usb_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *u
* not mandatory, so does not count on it*/
string[ret] = 0;
ret = sscanf(string, "%x %d %c %c%c:%d:%d %s%n", &tag, &timestamp, &etype,
&pipeid1, &pipeid2, &dev_addr, &ep_num, status,
&cnt);
&pipeid1, &pipeid2, &dev_addr, &ep_num, status,
&cnt);
if (ret < 8)
{
snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
@ -310,11 +310,11 @@ usb_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *u
/* try to convert to corresponding integer */
shdr = (pcap_usb_setup*)rawdata;
shdr->bmRequestType = htonl(strtol(str1, 0, 16));
shdr->bRequest = htonl(strtol(str2, 0, 16));
shdr->wValue = htonl(strtol(str3, 0, 16));
shdr->wIndex = htonl(strtol(str4, 0, 16));
shdr->wLength = htonl(strtol(str5, 0, 16));
shdr->bmRequestType = strtoul(str1, 0, 16);
shdr->bRequest = strtoul(str2, 0, 16);
shdr->wValue = htons(strtoul(str3, 0, 16));
shdr->wIndex = htons(strtoul(str4, 0, 16));
shdr->wLength = htons(strtoul(str5, 0, 16));
pkth.caplen = sizeof(pcap_usb_setup);
rawdata += sizeof(pcap_usb_setup);

14
pcap/usb.h
View File

@ -56,12 +56,16 @@ typedef struct _usb_header {
bpf_u_int32 setup_packet;
} pcap_usb_header;
/*
* defined in USB specification
*/
typedef struct _usb_setup {
bpf_u_int32 bmRequestType;
bpf_u_int32 bRequest;
bpf_u_int32 wValue;
bpf_u_int32 wIndex;
bpf_u_int32 wLength;
u_int8_t bmRequestType;
u_int8_t bRequest;
u_int16_t wValue;
u_int16_t wIndex;
u_int16_t wLength;
} pcap_usb_setup;
#endif