projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
29fbce4
)
More consistent variable naming.
author
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 18 May 2007 11:19:31 +0000
(11:19 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 18 May 2007 11:19:31 +0000
(11:19 +0000)
src/bsd/device.c
patch
|
blob
|
history
src/cygwin/device.c
patch
|
blob
|
history
src/linux/device.c
patch
|
blob
|
history
src/meta.c
patch
|
blob
|
history
src/mingw/device.c
patch
|
blob
|
history
src/raw_socket/device.c
patch
|
blob
|
history
src/solaris/device.c
patch
|
blob
|
history
src/uml_socket/device.c
patch
|
blob
|
history
diff --git
a/src/bsd/device.c
b/src/bsd/device.c
index
474612f
..
70f4757
100644
(file)
--- a/
src/bsd/device.c
+++ b/
src/bsd/device.c
@@
-142,13
+142,13
@@
void close_device(void) {
}
bool read_packet(vpn_packet_t *packet) {
}
bool read_packet(vpn_packet_t *packet) {
- int
leni
n;
+ int
inle
n;
cp();
switch(device_type) {
case DEVICE_TYPE_TUN:
cp();
switch(device_type) {
case DEVICE_TYPE_TUN:
- if((
leni
n = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+ if((
inle
n = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
@@
-170,14
+170,14
@@
bool read_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
- packet->len =
leni
n + 14;
+ packet->len =
inle
n + 14;
break;
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
break;
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
- if((
leni
n = readv(device_fd, vector, 2)) <= 0) {
+ if((
inle
n = readv(device_fd, vector, 2)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
@@
-201,18
+201,18
@@
bool read_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
- packet->len =
leni
n + 10;
+ packet->len =
inle
n + 10;
break;
}
case DEVICE_TYPE_TAP:
break;
}
case DEVICE_TYPE_TAP:
- if((
leni
n = read(device_fd, packet->data, MTU)) <= 0) {
+ if((
inle
n = read(device_fd, packet->data, MTU)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
- packet->len =
leni
n;
+ packet->len =
inle
n;
break;
default:
break;
default:
diff --git
a/src/cygwin/device.c
b/src/cygwin/device.c
index
db8cc9e
..
c4c85d8
100644
(file)
--- a/
src/cygwin/device.c
+++ b/
src/cygwin/device.c
@@
-176,7
+176,7
@@
bool setup_device(void) {
It passes everything it reads to the socket. */
char buf[MTU];
It passes everything it reads to the socket. */
char buf[MTU];
- long
leni
n;
+ long
inle
n;
CloseHandle(device_handle);
CloseHandle(device_handle);
@@
-199,8
+199,8
@@
bool setup_device(void) {
/* Pass packets */
for(;;) {
/* Pass packets */
for(;;) {
- ReadFile(device_handle, buf, MTU, &
leni
n, NULL);
- write(sp[1], buf,
leni
n);
+ ReadFile(device_handle, buf, MTU, &
inle
n, NULL);
+ write(sp[1], buf,
inle
n);
}
}
}
}
@@
-228,17
+228,17
@@
void close_device(void) {
}
bool read_packet(vpn_packet_t *packet) {
}
bool read_packet(vpn_packet_t *packet) {
- int
leni
n;
+ int
inle
n;
cp();
cp();
- if((
leni
n = read(sp[0], packet->data, MTU)) <= 0) {
+ if((
inle
n = read(sp[0], packet->data, MTU)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
- packet->len =
leni
n;
+ packet->len =
inle
n;
device_total_in += packet->len;
device_total_in += packet->len;
@@
-249,14
+249,14
@@
bool read_packet(vpn_packet_t *packet) {
}
bool write_packet(vpn_packet_t *packet) {
}
bool write_packet(vpn_packet_t *packet) {
- long
lenout
;
+ long
outlen
;
cp();
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
cp();
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
- if(!WriteFile (device_handle, packet->data, packet->len, &
lenout
, NULL)) {
+ if(!WriteFile (device_handle, packet->data, packet->len, &
outlen
, NULL)) {
logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError()));
return false;
}
logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError()));
return false;
}
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
519896e
..
90ba384
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/device.c
@@
-118,43
+118,43
@@
void close_device(void) {
}
bool read_packet(vpn_packet_t *packet) {
}
bool read_packet(vpn_packet_t *packet) {
- int
leni
n;
+ int
inle
n;
cp();
switch(device_type) {
case DEVICE_TYPE_TUN:
cp();
switch(device_type) {
case DEVICE_TYPE_TUN:
-
leni
n = read(device_fd, packet->data + 10, MTU - 10);
+
inle
n = read(device_fd, packet->data + 10, MTU - 10);
- if(
leni
n <= 0) {
+ if(
inle
n <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
- packet->len =
leni
n + 10;
+ packet->len =
inle
n + 10;
break;
case DEVICE_TYPE_TAP:
break;
case DEVICE_TYPE_TAP:
-
leni
n = read(device_fd, packet->data, MTU);
+
inle
n = read(device_fd, packet->data, MTU);
- if(
leni
n <= 0) {
+ if(
inle
n <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
- packet->len =
leni
n;
+ packet->len =
inle
n;
break;
case DEVICE_TYPE_ETHERTAP:
break;
case DEVICE_TYPE_ETHERTAP:
-
leni
n = read(device_fd, packet->data - 2, MTU + 2);
+
inle
n = read(device_fd, packet->data - 2, MTU + 2);
- if(
leni
n <= 0) {
+ if(
inle
n <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
- packet->len =
leni
n - 2;
+ packet->len =
inle
n - 2;
break;
}
break;
}
diff --git
a/src/meta.c
b/src/meta.c
index
af37d01
..
78b8160
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-137,7
+137,7
@@
void broadcast_meta(connection_t *from, const char *buffer, int length) {
bool receive_meta(connection_t *c) {
int oldlen, i, result;
bool receive_meta(connection_t *c) {
int oldlen, i, result;
- int
lenin, lenout
, reqlen;
+ int
inlen, outlen
, reqlen;
bool decrypted = false;
char inbuf[MAXBUFSIZE];
bool decrypted = false;
char inbuf[MAXBUFSIZE];
@@
-152,10
+152,10
@@
bool receive_meta(connection_t *c) {
- If not, keep stuff in buffer and exit.
*/
- If not, keep stuff in buffer and exit.
*/
-
leni
n = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
+
inle
n = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
- if(
leni
n <= 0) {
- if(!
leni
n || !errno) {
+ if(
inle
n <= 0) {
+ if(!
inle
n || !errno) {
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
c->name, c->hostname);
} else if(errno == EINTR)
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
c->name, c->hostname);
} else if(errno == EINTR)
@@
-168,19
+168,19
@@
bool receive_meta(connection_t *c) {
}
oldlen = c->buflen;
}
oldlen = c->buflen;
- c->buflen +=
leni
n;
+ c->buflen +=
inle
n;
- while(
leni
n > 0) {
+ while(
inle
n > 0) {
/* Decrypt */
if(c->status.decryptin && !decrypted) {
/* Decrypt */
if(c->status.decryptin && !decrypted) {
- result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &
lenout, (unsigned char *)c->buffer + oldlen, leni
n);
- if(!result ||
lenout != leni
n) {
+ result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &
outlen, (unsigned char *)c->buffer + oldlen, inle
n);
+ if(!result ||
outlen != inle
n) {
logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"),
c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
}
logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"),
c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
}
- memcpy(c->buffer + oldlen, inbuf,
leni
n);
+ memcpy(c->buffer + oldlen, inbuf,
inle
n);
decrypted = true;
}
decrypted = true;
}
@@
-191,7
+191,7
@@
bool receive_meta(connection_t *c) {
receive_tcppacket(c, c->buffer, c->tcplen);
c->buflen -= c->tcplen;
receive_tcppacket(c, c->buffer, c->tcplen);
c->buflen -= c->tcplen;
-
leni
n -= c->tcplen - oldlen;
+
inle
n -= c->tcplen - oldlen;
memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
oldlen = 0;
c->tcplen = 0;
memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
oldlen = 0;
c->tcplen = 0;
@@
-219,7
+219,7
@@
bool receive_meta(connection_t *c) {
return false;
c->buflen -= reqlen;
return false;
c->buflen -= reqlen;
-
leni
n -= reqlen - oldlen;
+
inle
n -= reqlen - oldlen;
memmove(c->buffer, c->buffer + reqlen, c->buflen);
oldlen = 0;
continue;
memmove(c->buffer, c->buffer + reqlen, c->buflen);
oldlen = 0;
continue;
diff --git
a/src/mingw/device.c
b/src/mingw/device.c
index
0e203e6
..
b3cbe3b
100644
(file)
--- a/
src/mingw/device.c
+++ b/
src/mingw/device.c
@@
-336,7
+336,7
@@
bool read_packet(vpn_packet_t *packet) {
}
bool write_packet(vpn_packet_t *packet) {
}
bool write_packet(vpn_packet_t *packet) {
- long
lenout
;
+ long
outlen
;
OVERLAPPED overlapped = {0};
cp();
OVERLAPPED overlapped = {0};
cp();
@@
-344,7
+344,7
@@
bool write_packet(vpn_packet_t *packet) {
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
- if(!WriteFile(device_handle, packet->data, packet->len, &
lenout
, &overlapped)) {
+ if(!WriteFile(device_handle, packet->data, packet->len, &
outlen
, &overlapped)) {
logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError()));
return false;
}
logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError()));
return false;
}
diff --git
a/src/raw_socket/device.c
b/src/raw_socket/device.c
index
ac7cc57
..
c246d1b
100644
(file)
--- a/
src/raw_socket/device.c
+++ b/
src/raw_socket/device.c
@@
-91,17
+91,17
@@
void close_device(void) {
}
bool read_packet(vpn_packet_t *packet) {
}
bool read_packet(vpn_packet_t *packet) {
- int
leni
n;
+ int
inle
n;
cp();
cp();
- if((
leni
n = read(device_fd, packet->data, MTU)) <= 0) {
+ if((
inle
n = read(device_fd, packet->data, MTU)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
- packet->len =
leni
n;
+ packet->len =
inle
n;
device_total_in += packet->len;
device_total_in += packet->len;
diff --git
a/src/solaris/device.c
b/src/solaris/device.c
index
c66db90
..
25f66f3
100644
(file)
--- a/
src/solaris/device.c
+++ b/
src/solaris/device.c
@@
-114,11
+114,11
@@
void close_device(void) {
}
bool read_packet(vpn_packet_t *packet) {
}
bool read_packet(vpn_packet_t *packet) {
- int
leni
n;
+ int
inle
n;
cp();
cp();
- if((
leni
n = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+ if((
inle
n = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
@@
-140,7
+140,7
@@
bool read_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
- packet->len =
leni
n + 14;
+ packet->len =
inle
n + 14;
device_total_in += packet->len;
device_total_in += packet->len;
diff --git
a/src/uml_socket/device.c
b/src/uml_socket/device.c
index
669d78e
..
27fdd33
100644
(file)
--- a/
src/uml_socket/device.c
+++ b/
src/uml_socket/device.c
@@
-172,7
+172,7
@@
void close_device(void) {
}
bool read_packet(vpn_packet_t *packet) {
}
bool read_packet(vpn_packet_t *packet) {
- int
leni
n;
+ int
inle
n;
cp();
cp();
@@
-202,7
+202,7
@@
bool read_packet(vpn_packet_t *packet) {
}
case 1: {
}
case 1: {
- if((
leni
n = read(request_fd, &request, sizeof request)) != sizeof request) {
+ if((
inle
n = read(request_fd, &request, sizeof request)) != sizeof request) {
logger(LOG_ERR, _("Error while reading request from %s %s: %s"), device_info,
device, strerror(errno));
running = false;
logger(LOG_ERR, _("Error while reading request from %s %s: %s"), device_info,
device, strerror(errno));
running = false;
@@
-232,14
+232,14
@@
bool read_packet(vpn_packet_t *packet) {
}
case 2: {
}
case 2: {
- if((
leni
n = read(data_fd, packet->data, MTU)) <= 0) {
+ if((
inle
n = read(data_fd, packet->data, MTU)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
running = false;
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
running = false;
return false;
}
- packet->len =
leni
n;
+ packet->len =
inle
n;
device_total_in += packet->len;
device_total_in += packet->len;