diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-10-28 13:22:23 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-10-28 13:22:23 -0400 |
| commit | 60ac1b77c54ee43d3a1c0d42d9349e455c348c3c (patch) | |
| tree | 28bb5e7377cd4cd4fc697ddfae0a71a27a241a52 /tap-mac | |
| parent | e514fe2bffff20631df81312816aa444098dde62 (diff) | |
| download | infinitytier-60ac1b77c54ee43d3a1c0d42d9349e455c348c3c.tar.gz infinitytier-60ac1b77c54ee43d3a1c0d42d9349e455c348c3c.zip | |
Fix for GitHub issue #25
Diffstat (limited to 'tap-mac')
| -rw-r--r-- | tap-mac/tuntap/src/tuntap.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tap-mac/tuntap/src/tuntap.cc b/tap-mac/tuntap/src/tuntap.cc index 941de94c..7fdbb795 100644 --- a/tap-mac/tuntap/src/tuntap.cc +++ b/tap-mac/tuntap/src/tuntap.cc @@ -648,7 +648,9 @@ tuntap_interface::cdev_write(uio_t uio, int ioflag) mb = first; while (uio_resid(uio) > 0) { /* copy a chunk. enforce mtu (don't know if this is correct behaviour) */ - chunk_len = min(ifnet_mtu(ifp), min(uio_resid(uio), mlen)); + // ... evidently not :) -- Adam Ierymenko <adam.ierymenko@zerotier.com> + //chunk_len = min(ifnet_mtu(ifp), min(uio_resid(uio), mlen)); + chunk_len = min(uio_resid(uio),mlen); error = uiomove((caddr_t) mbuf_data(mb), chunk_len, uio); if (error) { log(LOG_ERR, "tuntap: could not copy data from userspace: %d\n", error); @@ -664,7 +666,9 @@ tuntap_interface::cdev_write(uio_t uio, int ioflag) copied += chunk_len; /* if done, break the loop */ - if (uio_resid(uio) <= 0 || copied >= ifnet_mtu(ifp)) + //if (uio_resid(uio) <= 0 || copied >= ifnet_mtu(ifp)) + // break; + if (uio_resid(uio) <= 0) break; /* allocate a new mbuf if the current is filled */ |