mirror of https://github.com/wolfSSL/wolfssl.git
Fix a couple of issues related to the sniffer.
- Fix an issue in sniffer.c where some pointer math was giving a warning. - Fix an issue in snifftest.c where a local variable was never read. - Ignore non-TCP/IP packets in snifftest.c. Fixes some tests with pcaps with other types of packets.pull/3459/head
parent
f8176dd646
commit
3b1c536418
|
@ -4730,7 +4730,7 @@ static int CheckPreRecord(IpInfo* ipInfo, TcpInfo* tcpInfo,
|
||||||
word32 i, offset, headerSz, qty, remainder;
|
word32 i, offset, headerSz, qty, remainder;
|
||||||
|
|
||||||
Trace(CHAIN_INPUT_STR);
|
Trace(CHAIN_INPUT_STR);
|
||||||
headerSz = (word32)*sslFrame - (word32)chain[0].iov_base;
|
headerSz = (word32)((const byte*)*sslFrame - (const byte*)chain[0].iov_base);
|
||||||
remainder = *sslBytes;
|
remainder = *sslBytes;
|
||||||
|
|
||||||
if ( (*sslBytes + length) > ssl->buffers.inputBuffer.bufferSize) {
|
if ( (*sslBytes + length) > ssl->buffers.inputBuffer.bufferSize) {
|
||||||
|
|
|
@ -519,15 +519,27 @@ int main(int argc, char** argv)
|
||||||
#endif
|
#endif
|
||||||
ret = ssl_SetPrivateKey(server, port, argv[2],
|
ret = ssl_SetPrivateKey(server, port, argv[2],
|
||||||
FILETYPE_PEM, passwd, err);
|
FILETYPE_PEM, passwd, err);
|
||||||
|
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
loadCount++;
|
loadCount++;
|
||||||
if (loadCount > 0) {
|
|
||||||
ret = 0;
|
if (loadCount == 0) {
|
||||||
}
|
|
||||||
else {
|
|
||||||
printf("Failed loading private key %d\n", ret);
|
printf("Failed loading private key %d\n", ret);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Only let through TCP/IP packets */
|
||||||
|
ret = pcap_compile(pcap, &fp, "(ip6 or ip) and tcp", 0, 0);
|
||||||
|
if (ret != 0) {
|
||||||
|
printf("pcap_compile failed %s\n", pcap_geterr(pcap));
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = pcap_setfilter(pcap, &fp);
|
||||||
|
if (ret != 0) {
|
||||||
|
printf("pcap_setfilter failed %s\n", pcap_geterr(pcap));
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in New Issue