diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-12-12 13:02:02 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-12-12 13:02:02 -0800 |
| commit | 54d1b11b1981481ba177c8f7c84c179977f5652d (patch) | |
| tree | aa8eacfe1d0badfca3f9cb6e9856b9f458e1a785 /node/EthernetTap.cpp | |
| parent | f038ed9ca2f3e65e063571e77cd48f1072f2d3e3 (diff) | |
| parent | 68defd998008e83e5348d29cab5535dab3d444e8 (diff) | |
| download | infinitytier-54d1b11b1981481ba177c8f7c84c179977f5652d.tar.gz infinitytier-54d1b11b1981481ba177c8f7c84c179977f5652d.zip | |
Merge branch 'adamierymenko-dev'
Diffstat (limited to 'node/EthernetTap.cpp')
| -rw-r--r-- | node/EthernetTap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/EthernetTap.cpp b/node/EthernetTap.cpp index fadd8e50..44118c2a 100644 --- a/node/EthernetTap.cpp +++ b/node/EthernetTap.cpp @@ -693,7 +693,7 @@ void EthernetTap::threadMain() // data until we have at least a frame. r += n; if (r > 14) { - if (r > (_mtu + 14)) // sanity check for weird TAP behavior on some platforms + if (r > ((int)_mtu + 14)) // sanity check for weird TAP behavior on some platforms r = _mtu + 14; for(int i=0;i<6;++i) to.data[i] = (unsigned char)getBuf[i]; |