j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

- s/ip_t/ipv4_t/g

Browse source 
- Add "salt" to the beginning of UDP packets. Replaces length field which
  is not useful anyway.
This commit is contained in:
Guus Sliepen 2001-05-07 19:08:46 +00:00
parent a26081467c
commit e4f3d93ec6
5 changed files with 188 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

268
ABOUT-NLS
View file

@ -8,7 +8,7 @@ A few packages already provide translations for their messages.
If you found this `ABOUT-NLS' file inside a distribution, you may If you found this `ABOUT-NLS' file inside a distribution, you may
assume that the distributed package does use GNU `gettext' internally, assume that the distributed package does use GNU `gettext' internally,
itself available at your nearest GNU archive site. But you do *not* itself available at your nearest GNU archive site. But you do _not_
need to install GNU `gettext' prior to configuring, installing or using need to install GNU `gettext' prior to configuring, installing or using
this package with messages translated. this package with messages translated.
@ -22,8 +22,8 @@ related to internationalization, you should tell about the version of
`gettext' which is used. The information can be found in the `gettext' which is used. The information can be found in the
`intl/VERSION' file, in internationalized packages. `intl/VERSION' file, in internationalized packages.
One advise in advance Quick configuration advice
===================== ==========================
If you want to exploit the full power of internationalization, you If you want to exploit the full power of internationalization, you
should configure it using should configure it using
@ -34,13 +34,14 @@ to force usage of internationalizing routines provided within this
package, despite the existence of internationalizing capabilities in the package, despite the existence of internationalizing capabilities in the
operating system where this package is being installed. So far, only operating system where this package is being installed. So far, only
the `gettext' implementation in the GNU C library version 2 provides as the `gettext' implementation in the GNU C library version 2 provides as
many features (such as locale alias or message inheritance) as the many features (such as locale alias, message inheritance, automatic
implementation here. It is also not possible to offer this additional charset conversion or plural form handling) as the implementation here.
functionality on top of a `catgets' implementation. Future versions of It is also not possible to offer this additional functionality on top
GNU `gettext' will very likely convey even more functionality. So it of a `catgets' implementation. Future versions of GNU `gettext' will
might be a good idea to change to GNU `gettext' as soon as possible. very likely convey even more functionality. So it might be a good idea
to change to GNU `gettext' as soon as possible.
So you need not provide this option if you are using GNU libc 2 or So you need _not_ provide this option if you are using GNU libc 2 or
you have installed a recent copy of the GNU gettext package with the you have installed a recent copy of the GNU gettext package with the
included `libintl'. included `libintl'.
@ -53,23 +54,20 @@ Most such packages use GNU `gettext'. Other packages have their own
ways to internationalization, predating GNU `gettext'. ways to internationalization, predating GNU `gettext'.
By default, this package will be installed to allow translation of By default, this package will be installed to allow translation of
messages. It will automatically detect whether the system provides messages. It will automatically detect whether the system already
usable `catgets' (if using this is selected by the installer) or provides the GNU `gettext' functions. If not, the GNU `gettext' own
`gettext' functions. If neither is available, the GNU `gettext' own
library will be used. This library is wholly contained within this library will be used. This library is wholly contained within this
package, usually in the `intl/' subdirectory, so prior installation of package, usually in the `intl/' subdirectory, so prior installation of
the GNU `gettext' package is *not* required. Installers may use the GNU `gettext' package is _not_ required. Installers may use
special options at configuration time for changing the default special options at configuration time for changing the default
behaviour. The commands: behaviour. The commands:
./configure --with-included-gettext ./configure --with-included-gettext
./configure --with-catgets
./configure --disable-nls ./configure --disable-nls
will respectively bypass any pre-existing `catgets' or `gettext' to use will respectively bypass any pre-existing `gettext' to use the
the internationalizing routines provided within this package, enable internationalizing routines provided within this package, or else,
the use of the `catgets' functions (if found on the locale system), or _totally_ disable translation of messages.
else, *totally* disable translation of messages.
When you already have GNU `gettext' installed on your system and run When you already have GNU `gettext' installed on your system and run
configure without an option for your new package, `configure' will configure without an option for your new package, `configure' will
@ -83,18 +81,10 @@ package is more recent, you should use
to prevent auto-detection. to prevent auto-detection.
By default the configuration process will not test for the `catgets' The configuration process will not test for the `catgets' function
function and therefore they will not be used. The reasons are already and therefore it will not be used. The reason is that even an
given above: the emulation on top of `catgets' cannot provide all the emulation of `gettext' on top of `catgets' could not provide all the
extensions provided by the GNU `gettext' library. If you nevertheless extensions of the GNU `gettext' library.
want to use the `catgets' functions use
./configure --with-catgets
to enable the test for `catgets' (this causes no harm if `catgets' is
not available on your system). If you really select this option we
would like to hear about the reasons because we cannot think of any
good one ourself.
Internationalized packages have usually many `po/LL.po' files, where Internationalized packages have usually many `po/LL.po' files, where
LL gives an ISO 639 two-letter code identifying the language. Unless LL gives an ISO 639 two-letter code identifying the language. Unless
@ -110,22 +100,35 @@ Using This Package
As a user, if your language has been installed for this package, you As a user, if your language has been installed for this package, you
only have to set the `LANG' environment variable to the appropriate only have to set the `LANG' environment variable to the appropriate
ISO 639 `LL' two-letter code prior to using the programs in the `LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
package. For example, let's suppose that you speak German. At the and `CC' is an ISO 3166 two-letter country code. For example, let's
shell prompt, merely execute `setenv LANG de' (in `csh'), suppose that you speak German and live in Germany. At the shell
`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This prompt, merely execute `setenv LANG de_DE' (in `csh'),
can be done from your `.login' or `.profile' file, once and for all. `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
This can be done from your `.login' or `.profile' file, once and for
all.
An operating system might already offer message localization for You might think that the country code specification is redundant.
many of its programs, while other programs have been installed locally But in fact, some languages have dialects in different countries. For
with the full capabilities of GNU `gettext'. Just using `gettext' example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
extended syntax for `LANG' would break proper localization of already country code serves to distinguish the dialects.
available operating system programs. In this case, users should set
both `LANGUAGE' and `LANG' variables in their environment, as programs Not all programs have translations for all languages. By default, an
using GNU `gettext' give preference to `LANGUAGE'. For example, some English message is shown in place of a nonexistent translation. If you
Swedish users would rather read translations in German than English for understand other languages, you can set up a priority list of languages.
when Swedish is not available. This is easily accomplished by setting This is done through a different environment variable, called
`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'. `LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
for the purpose of message handling, but you still need to have `LANG'
set to the primary language; this is required by other parts of the
system libraries. For example, some Swedish users who would rather
read translations in German than English for when Swedish is not
available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
In the `LANGUAGE' environment variable, but not in the `LANG'
environment variable, `LL_CC' combinations can be abbreviated as `LL'
to denote the language's main dialect. For example, `de' is equivalent
to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
(Portuguese as spoken in Portugal) in this context.
Translating Teams Translating Teams
================= =================
@ -133,33 +136,21 @@ Translating Teams
For the Free Translation Project to be a success, we need interested For the Free Translation Project to be a success, we need interested
people who like their own language and write it well, and who are also people who like their own language and write it well, and who are also
able to synergize with other translators speaking the same language. able to synergize with other translators speaking the same language.
Each translation team has its own mailing list, courtesy of Linux Each translation team has its own mailing list. The up-to-date list of
International. You may reach your translation team at the address teams can be found at the Free Translation Project's homepage,
`LL@li.org', replacing LL by the two-letter ISO 639 code for your `http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
language. Language codes are *not* the same as the country codes given area.
in ISO 3166. The following translation teams exist, as of December
1997:
Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en', If you'd like to volunteer to _work_ at translating messages, you
Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
`hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
`pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
Swedish `sv', and Turkish `tr'.
For example, you may reach the Chinese translation team by writing to
`zh@li.org'.
If you'd like to volunteer to *work* at translating messages, you
should become a member of the translating team for your own language. should become a member of the translating team for your own language.
The subscribing address is *not* the same as the list itself, it has The subscribing address is _not_ the same as the list itself, it has
`-request' appended. For example, speakers of Swedish can send a `-request' appended. For example, speakers of Swedish can send a
message to `sv-request@li.org', having this message body: message to `sv-request@li.org', having this message body:
subscribe subscribe
Keep in mind that team members are expected to participate Keep in mind that team members are expected to participate
*actively* in translations, or at solving translational difficulties, _actively_ in translations, or at solving translational difficulties,
rather than merely lurking around. If your team does not exist yet and rather than merely lurking around. If your team does not exist yet and
you want to start one, or if you are unsure about what to do or how to you want to start one, or if you are unsure about what to do or how to
get started, please write to `translation@iro.umontreal.ca' to reach the get started, please write to `translation@iro.umontreal.ca' to reach the
@ -173,42 +164,98 @@ Available Packages
================== ==================
Languages are not equally supported in all packages. The following Languages are not equally supported in all packages. The following
matrix shows the current state of internationalization, as of December matrix shows the current state of internationalization, as of July
1997. The matrix shows, in regard of each package, for which languages 2000. The matrix shows, in regard of each package, for which languages
PO files have been submitted to translation coordination. PO files have been submitted to translation coordination, with a
translation percentage of at least 50%.
Ready PO files cs da de en es fi fr it ja ko nl no pl pt ru sl sv Ready PO files bg cs da de el en eo es et fi fr gl hr id it
.----------------------------------------------------. .----------------------------------------------.
bash | [] [] [] | 3 a2ps | [] [] |
bison | [] [] [] | 3 bash | [] [] [] |
clisp | [] [] [] [] | 4 bison | [] [] [] [] |
cpio | [] [] [] [] [] [] | 6 clisp | [] [] [] [] |
diffutils | [] [] [] [] [] | 5 cpio | [] [] [] |
enscript | [] [] [] [] [] [] | 6 diffutils | [] [] [] [] [] |
fileutils | [] [] [] [] [] [] [] [] [] [] | 10 enscript | [] [] |
findutils | [] [] [] [] [] [] [] [] [] | 9 error | [] |
flex | [] [] [] [] | 4 fileutils | [] [] [] [] [] [] [] [] |
gcal | [] [] [] [] [] | 5 findutils | [] [] [] [] [] [] |
gettext | [] [] [] [] [] [] [] [] [] [] [] | 12 flex | [] [] |
grep | [] [] [] [] [] [] [] [] [] [] | 10 gcal | |
hello | [] [] [] [] [] [] [] [] [] [] [] | 11 gcc | |
id-utils | [] [] [] | 3 gettext | [] [] [] [] [] [] [] [] [] |
indent | [] [] [] [] [] | 5 gnupg | [] [] [] [] |
libc | [] [] [] [] [] [] [] | 7 grep | [] [] [] [] [] [] [] [] [] [] |
m4 | [] [] [] [] [] [] | 6 hello | [] [] [] [] [] [] [] |
make | [] [] [] [] [] [] | 6 id-utils | [] |
music | [] [] | 2 indent | [] [] [] [] [] |
ptx | [] [] [] [] [] [] [] [] | 8 libc | [] [] [] [] [] [] [] [] |
recode | [] [] [] [] [] [] [] [] [] | 9 lilypond | |
sh-utils | [] [] [] [] [] [] [] [] | 8 lynx | [] [] [] |
sharutils | [] [] [] [] [] [] | 6 m4 | [] [] [] [] [] [] |
tar | [] [] [] [] [] [] [] [] [] [] [] | 11 make | [] [] [] [] |
texinfo | [] [] [] | 3 music | [] |
textutils | [] [] [] [] [] [] [] [] [] | 9 parted | [] [] |
wdiff | [] [] [] [] [] [] [] [] | 8 ptx | [] [] [] [] [] [] [] |
`----------------------------------------------------' python | |
17 languages cs da de en es fi fr it ja ko nl no pl pt ru sl sv recode | [] [] [] [] [] [] [] |
27 packages 6 4 25 1 18 1 26 2 1 12 20 9 19 7 4 7 17 179 sed | [] [] [] [] [] [] [] |
sh-utils | [] [] [] [] [] [] [] [] [] |
sharutils | [] [] [] [] [] [] |
tar | [] [] [] [] [] [] [] |
texinfo | [] [] [] [] |
textutils | [] [] [] [] [] [] [] |
util-linux | |
wdiff | [] [] [] [] [] |
wget | [] [] [] [] [] [] [] [] |
`----------------------------------------------'
bg cs da de el en eo es et fi fr gl hr id it
1 14 15 28 11 1 4 19 12 1 30 16 0 3 12
ja ko lv nl no pl pt pt_BR ru sk sl sv zh
.-------------------------------------------.
a2ps | [] [] [] | 5
bash | | 3
bison | [] [] [] | 7
clisp | [] | 5
cpio | [] [] [] [] [] | 8
diffutils | [] [] [] | 8
enscript | [] [] | 4
error | | 1
fileutils | [] [] [] [] [] [] [] [] [] | 17
findutils | [] [] [] [] [] [] | 12
flex | [] [] [] | 5
gcal | | 0
gcc | [] | 1
gettext | [] [] [] [] [] [] [] [] [] | 18
gnupg | [] [] [] | 7
grep | [] [] [] [] [] [] [] | 17
hello | [] [] [] [] [] [] [] [] | 15
id-utils | [] [] [] | 4
indent | [] [] [] [] [] | 10
libc | [] [] [] [] [] [] [] [] | 16
lilypond | [] [] | 2
lynx | [] [] [] [] | 7
m4 | [] [] [] [] [] | 11
make | [] [] [] [] [] | 9
music | [] | 2
parted | [] [] [] [] | 6
ptx | [] [] [] [] [] [] | 13
python | | 0
recode | [] [] [] | 10
sed | [] [] [] [] [] [] [] | 14
sh-utils | [] [] [] [] [] [] [] [] [] [] | 19
sharutils | [] [] [] [] | 10
tar | [] [] [] [] [] [] [] [] | 15
texinfo | [] [] | 6
textutils | [] [] [] [] [] [] [] [] | 15
util-linux | [] | 1
wdiff | [] [] [] [] [] | 10
wget | [] [] [] [] [] [] [] [] [] | 17
`-------------------------------------------'
28 teams ja ko lv nl no pl pt pt_BR ru sk sl sv zh
38 domains 20 8 0 25 6 18 1 16 27 9 10 20 3 330
Some counters in the preceding matrix are higher than the number of Some counters in the preceding matrix are higher than the number of
visible blocks let us expect. This is because a few extra PO files are visible blocks let us expect. This is because a few extra PO files are
@ -221,6 +268,25 @@ distributed as such by its maintainer. There might be an observable
lag between the mere existence a PO file and its wide availability in a lag between the mere existence a PO file and its wide availability in a
distribution. distribution.
If December 1997 seems to be old, you may fetch a more recent copy If July 2000 seems to be old, you may fetch a more recent copy of
of this `ABOUT-NLS' file on most GNU archive sites. this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
matrix with full percentage details can be found at
`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
Using `gettext' in new packages
===============================
If you are writing a freely available program and want to
internationalize it you are welcome to use GNU `gettext' in your
package. Of course the GNU Public License applies to your sources from
then if you include `gettext' directly in your distribution on but
since you are writing free software anyway this is no restriction.
Once the sources are change appropriately and the setup can handle to
use of `gettext' the only thing missing are the translations. The Free
Translation Project is also available for packages which are not
developed inside the GNU project. Therefore the information given above
applies also for every other Free Software Project. Contact
`translation@iro.umontreal.ca' to make the `.pot' files available to
the translation teams.

26
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.104 2001/05/04 18:45:02 guus Exp $ $Id: net.c,v 1.35.4.105 2001/05/07 19:08:43 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -134,12 +134,12 @@ cp
/* Encrypt the packet. */ /* Encrypt the packet. */
outpkt.len = inpkt->len; RAND_bytes(inpkt->salt, sizeof(inpkt->salt));
EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len); EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len);
EVP_EncryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len); EVP_EncryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len + sizeof(inpkt->salt));
EVP_EncryptFinal(&ctx, outpkt.data + outlen, &outpad); EVP_EncryptFinal(&ctx, outpkt.salt + outlen, &outpad);
outlen += outpad + 2; outlen += outpad;
total_socket_out += outlen; total_socket_out += outlen;
@ -147,7 +147,7 @@ cp
to.sin_addr.s_addr = htonl(cl->address); to.sin_addr.s_addr = htonl(cl->address);
to.sin_port = htons(cl->port); to.sin_port = htons(cl->port);
if((sendto(myself->socket, (char *) &(outpkt.len), outlen, 0, (const struct sockaddr *)&to, tolen)) < 0) if((sendto(myself->socket, (char *) outpkt.salt, outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
{ {
syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"), syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
cl->name, cl->hostname); cl->name, cl->hostname);
@ -172,14 +172,13 @@ void receive_udppacket(connection_t *cl, vpn_packet_t *inpkt)
int outlen, outpad; int outlen, outpad;
EVP_CIPHER_CTX ctx; EVP_CIPHER_CTX ctx;
cp cp
outpkt.len = inpkt->len;
/* Decrypt the packet */ /* Decrypt the packet */
EVP_DecryptInit(&ctx, myself->cipher_pkttype, myself->cipher_pktkey, myself->cipher_pktkey + myself->cipher_pkttype->key_len); EVP_DecryptInit(&ctx, myself->cipher_pkttype, myself->cipher_pktkey, myself->cipher_pktkey + myself->cipher_pkttype->key_len);
EVP_DecryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len + 8); EVP_DecryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len);
EVP_DecryptFinal(&ctx, outpkt.data + outlen, &outpad); EVP_DecryptFinal(&ctx, outpkt.salt + outlen, &outpad);
outlen += outpad; outlen += outpad;
outpkt.len = outlen - sizeof(outpkt.salt);
receive_packet(cl, &outpkt); receive_packet(cl, &outpkt);
cp cp
@ -576,7 +575,7 @@ cp
return -1; return -1;
} }
ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0]))); ncn->address = ntohl(*((ipv4_t*)(h->h_addr_list[0])));
ncn->hostname = hostlookup(htonl(ncn->address)); ncn->hostname = hostlookup(htonl(ncn->address));
if(setup_outgoing_meta_socket(ncn) < 0) if(setup_outgoing_meta_socket(ncn) < 0)
@ -806,7 +805,7 @@ cp
myself->cipher_pktkeylength = myself->cipher_pkttype->key_len + myself->cipher_pkttype->iv_len; myself->cipher_pktkeylength = myself->cipher_pkttype->key_len + myself->cipher_pkttype->iv_len;
myself->cipher_pktkey = (char *)xmalloc(myself->cipher_pktkeylength); myself->cipher_pktkey = (char *)xmalloc(myself->cipher_pktkeylength);
RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength); RAND_pseudo_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
if(!(cfg = get_config_val(config, config_keyexpire))) if(!(cfg = get_config_val(config, config_keyexpire)))
keylifetime = 3600; keylifetime = 3600;
@ -1046,7 +1045,6 @@ void handle_incoming_vpn_data(void)
{ {
vpn_packet_t pkt; vpn_packet_t pkt;
int x, l = sizeof(x); int x, l = sizeof(x);
int lenin;
struct sockaddr_in from; struct sockaddr_in from;
socklen_t fromlen = sizeof(from); socklen_t fromlen = sizeof(from);
connection_t *cl; connection_t *cl;
@ -1063,7 +1061,7 @@ cp
return; return;
} }
if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0) if((pkt.len = recvfrom(myself->socket, (char *) pkt.salt, MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
{ {
syslog(LOG_ERR, _("Receiving packet failed: %m")); syslog(LOG_ERR, _("Receiving packet failed: %m"));
return; return;

10
src/net.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.h,v 1.9.4.29 2001/03/04 13:59:28 guus Exp $ $Id: net.h,v 1.9.4.30 2001/05/07 19:08:46 guus Exp $
*/ */
#ifndef __TINC_NET_H__ #ifndef __TINC_NET_H__
@ -27,8 +27,9 @@
#include "config.h" #include "config.h"
#define MAXSIZE 1700 /* should be a bit more than the MTU for the tapdevice */ #define MAXSIZE 1700 /* should be a bit more than the MTU for the tapdevice */
#define MTU 1600 #define MTU 1600
#define SALTLEN 2 /* to spice things up for the NSA... */
#define MAC_ADDR_S "%02x:%02x:%02x:%02x:%02x:%02x" #define MAC_ADDR_S "%02x:%02x:%02x:%02x:%02x:%02x"
#define MAC_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \ #define MAC_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \
@ -58,8 +59,6 @@ typedef struct mac_t
typedef unsigned long ipv4_t; typedef unsigned long ipv4_t;
typedef ipv4_t ip_t; /* alias for ipv4_t */
typedef struct ipv6_t typedef struct ipv6_t
{ {
unsigned short x[8]; unsigned short x[8];
@ -70,7 +69,8 @@ typedef unsigned short port_t;
typedef short length_t; typedef short length_t;
typedef struct vpn_packet_t { typedef struct vpn_packet_t {
length_t len; /* the actual number of bytes in the `data' field */ length_t len; /* the actual number of bytes in the `data' field */
unsigned char salt[SALTLEN]; /* two bytes of randomness */
unsigned char data[MAXSIZE]; unsigned char data[MAXSIZE];
} vpn_packet_t; } vpn_packet_t;

4
src/netutl.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: netutl.c,v 1.12.4.18 2001/01/07 17:09:02 guus Exp $ $Id: netutl.c,v 1.12.4.19 2001/05/07 19:08:46 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -106,7 +106,7 @@ cp
} }
ip = xmalloc(sizeof(*ip)); ip = xmalloc(sizeof(*ip));
ip->address = ntohl(*((ip_t*)(h->h_addr_list[0]))); ip->address = ntohl(*((ipv4_t*)(h->h_addr_list[0])));
ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0; ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
cp cp

4
src/protocol.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: protocol.c,v 1.28.4.86 2001/03/13 21:33:31 guus Exp $ $Id: protocol.c,v 1.28.4.87 2001/05/07 19:08:46 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -915,7 +915,7 @@ cp
int del_host_h(connection_t *cl) int del_host_h(connection_t *cl)
{ {
char name[MAX_STRING_SIZE]; char name[MAX_STRING_SIZE];
ip_t address; ipv4_t address;
port_t port; port_t port;
long int options; long int options;
connection_t *old, *p; connection_t *old, *p;