X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcygwin%2Fdevice.c;h=617214d0a3b0fe6bf4ec195cb71fb084f2e59791;hb=a227843b739d279b63adcf3736ebb03d856080c4;hp=c6e6f35392a4f0e76704f75d1991255bafe20977;hpb=78fc59e994c764d072bf0045177f690a378d1308;p=tinc diff --git a/src/cygwin/device.c b/src/cygwin/device.c index c6e6f353..617214d0 100644 --- a/src/cygwin/device.c +++ b/src/cygwin/device.c @@ -13,11 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "system.h" @@ -46,8 +44,7 @@ static int device_total_out = 0; static pid_t reader_pid; static int sp[2]; -bool setup_device(void) -{ +bool setup_device(void) { HKEY key, key2; int i, err; @@ -60,8 +57,6 @@ bool setup_device(void) bool found = false; - cp(); - get_config_string(lookup_config(config_tree, "Device"), &device); get_config_string(lookup_config(config_tree, "Interface"), &iface); @@ -218,10 +213,7 @@ bool setup_device(void) return true; } -void close_device(void) -{ - cp(); - +void close_device(void) { close(sp[0]); close(sp[1]); CloseHandle(device_handle); @@ -232,12 +224,9 @@ void close_device(void) free(iface); } -bool read_packet(vpn_packet_t *packet) -{ +bool read_packet(vpn_packet_t *packet) { int lenin; - cp(); - if((lenin = read(sp[0], packet->data, MTU)) <= 0) { logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); @@ -254,12 +243,9 @@ bool read_packet(vpn_packet_t *packet) return true; } -bool write_packet(vpn_packet_t *packet) -{ +bool write_packet(vpn_packet_t *packet) { long lenout; - cp(); - ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"), packet->len, device_info); @@ -273,10 +259,7 @@ bool write_packet(vpn_packet_t *packet) return true; } -void dump_device_stats(void) -{ - cp(); - +void dump_device_stats(void) { logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); logger(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in); logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);