projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9267bed
)
Tiny bits of code beautifying
author
Ivo Timmermans
<ivo@lychnis.net>
Tue, 5 Dec 2000 08:59:30 +0000
(08:59 +0000)
committer
Ivo Timmermans
<ivo@lychnis.net>
Tue, 5 Dec 2000 08:59:30 +0000
(08:59 +0000)
src/net.c
patch
|
blob
|
history
src/protocol.c
patch
|
blob
|
history
diff --git
a/src/net.c
b/src/net.c
index
d89c7c6
..
ed00610
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net.c,v 1.35.4.8
6 2000/11/30 23:18:1
9 zarq Exp $
+ $Id: net.c,v 1.35.4.8
7 2000/12/05 08:59:2
9 zarq Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-386,9
+386,9
@@
int setup_tap_fd(void)
const char *tapfname;
config_t const *cfg;
#ifdef HAVE_LINUX
const char *tapfname;
config_t const *cfg;
#ifdef HAVE_LINUX
-
#
ifdef HAVE_TUNTAP
+
#
ifdef HAVE_TUNTAP
struct ifreq ifr;
struct ifreq ifr;
-
#
endif
+
#
endif
#endif
cp
#endif
cp
@@
-397,11
+397,11
@@
cp
else
{
#ifdef HAVE_LINUX
else
{
#ifdef HAVE_LINUX
-
#
ifdef HAVE_TUNTAP
+
#
ifdef HAVE_TUNTAP
tapfname = "/dev/misc/net/tun";
tapfname = "/dev/misc/net/tun";
-
#
else
+
#
else
tapfname = "/dev/tap0";
tapfname = "/dev/tap0";
-
#
endif
+
#
endif
#endif
#ifdef HAVE_FREEBSD
tapfname = "/dev/tap0";
#endif
#ifdef HAVE_FREEBSD
tapfname = "/dev/tap0";
diff --git
a/src/protocol.c
b/src/protocol.c
index
a46894d
..
8a3d1c3
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol.c,v 1.28.4.6
8 2000/11/30 23:18:21
zarq Exp $
+ $Id: protocol.c,v 1.28.4.6
9 2000/12/05 08:59:30
zarq Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-72,11
+72,12
@@
int check_id(char *id)
for (i = 0; i < strlen(id); i++)
if(!isalnum(id[i]) && id[i] != '_')
return -1;
for (i = 0; i < strlen(id); i++)
if(!isalnum(id[i]) && id[i] != '_')
return -1;
-
+
return 0;
}
return 0;
}
-/* Generic request routines - takes care of logging and error detection as well */
+/* Generic request routines - takes care of logging and error
+ detection as well */
int send_request(connection_t *cl, const char *format, ...)
{
int send_request(connection_t *cl, const char *format, ...)
{
@@
-85,8
+86,9
@@
int send_request(connection_t *cl, const char *format, ...)
int len, request;
cp
int len, request;
cp
- /* Use vsnprintf instead of vasprintf: faster, no memory fragmentation, cleanup is automatic,
- and there is a limit on the input buffer anyway */
+ /* Use vsnprintf instead of vasprintf: faster, no memory
+ fragmentation, cleanup is automatic, and there is a limit on the
+ input buffer anyway */
va_start(args, format);
len = vsnprintf(buffer, MAXBUFSIZE, format, args);
va_start(args, format);
len = vsnprintf(buffer, MAXBUFSIZE, format, args);
@@
-174,9
+176,10
@@
cp
(H) SHA1,
(E) Encrypted with symmetric cipher.
(H) SHA1,
(E) Encrypted with symmetric cipher.
- Part of the challenge is directly used to set the symmetric cipher key and the initial vector.
- Since a man-in-the-middle cannot decrypt the RSA challenges, this means that he cannot get or
- forge the key for the symmetric cipher.
+ Part of the challenge is directly used to set the symmetric cipher
+ key and the initial vector. Since a man-in-the-middle cannot
+ decrypt the RSA challenges, this means that he cannot get or forge
+ the key for the symmetric cipher.
*/
int send_id(connection_t *cl)
*/
int send_id(connection_t *cl)