dect
/
libpcap
Archived
13
0
Fork 0
Code Releases Activity

From Dustin Spicuzza: if the activate routine doesn't supply an error 

message, supply the error message corresponding to the activate
routine's return status, for the benefit of programs that don't handle
different error returns differently.
This commit is contained in:
Guy Harris 2009-08-11 21:31:18 -07:00
parent 1628ad56b0
commit 96fece483a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcap.c
View File

@ -303,6 +303,16 @@ pcap_activate(pcap_t *p)
status = p->activate_op(p);
if (status >= 0)
p->activated = 1;
else if (p->errbuf[0] == '\0') {
/*
* No error message supplied by the activate routine;
* for the benefit of programs that don't specially
* handle errors other than PCAP_ERROR, return the
* error message corresponding to the status.
*/
snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s",
pcap_statustostr(status));
}
return (status);
}
@ -343,7 +353,7 @@ fail:
if (status == PCAP_ERROR)
snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", source,
p->errbuf);
else if(status == PCAP_ERROR_NO_SUCH_DEVICE ||
else if (status == PCAP_ERROR_NO_SUCH_DEVICE ||
status == PCAP_ERROR_PERM_DENIED)
snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s (%s)", source,
pcap_statustostr(status), p->errbuf);