Date: Sun, 21 Jun 1998 11:46:45 +0100 From: Brian Somers <brian@Awfulhak.org> To: freebsd-hackers@FreeBSD.ORG, Charles Mott <cmott@srv.net>, Ari Suutari <ari@suutari.iki.fi> Subject: CUSEEME Message-ID: <199806211046.LAA14433@awfulhak.org>
next in thread | raw e-mail | index | archive | help
This is a multipart MIME message. --==_Exmh_-12780776480 Content-Type: text/plain; charset=us-ascii Hi, Is anyone in a position to test these patches to libalias ? I have no way of testing them myself, but the job looked so straight forward that I thought I'd give it a shot. I've attached the patches because they're reasonably small (<4k). The patches are against libalias in -current. If you're not running -current, you can download the latest ppp from http://www.Awfulhak.org/ppp/ and use the libalias from there. The patched libalias *should* provide CUSEEME support for more than one host behind a natd/ppp -alias gateway, but I must stress, I've no way of testing it here. Thanks. -- Brian <brian@Awfulhak.org>, <brian@FreeBSD.org>, <brian@OpenBSD.org> <http://www.Awfulhak.org>; Don't _EVER_ lose your sense of humour.... --==_Exmh_-12780776480 Content-Type: application/x-gzip ; name="libalias.tar.gz" Content-Description: libalias.tar.gz Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="libalias.tar.gz" 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 --==_Exmh_-12780776480 Content-Type: application/x-patch ; name="libalias.patch" Content-Description: libalias.patch Content-Disposition: attachment; filename="libalias.patch" Index: Makefile =================================================================== RCS file: /home/ncvs/src/lib/libalias/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 1998/05/24 03:03:09 1.6 +++ Makefile 1998/06/12 00:07:27 @@ -2,8 +2,8 @@ SHLIB_MAJOR= 2 SHLIB_MINOR= 5 CFLAGS+=-Wall -I${.CURDIR} -SRCS= alias.c alias_db.c alias_ftp.c alias_irc.c alias_util.c alias_old.c \ - alias_nbt.c +SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ + alias_nbt.c alias_old.c alias_util.c MAN3=libalias.3 Index: alias.c =================================================================== RCS file: /home/ncvs/src/lib/libalias/alias.c,v retrieving revision 1.7 diff -u -r1.7 alias.c --- alias.c 1998/06/10 00:26:19 1.7 +++ alias.c 1998/06/12 00:34:47 @@ -99,6 +99,7 @@ #define FTP_CONTROL_PORT_NUMBER 21 #define IRC_CONTROL_PORT_NUMBER_1 6667 #define IRC_CONTROL_PORT_NUMBER_2 6668 +#define CUSEEME_PORT_NUMBER 7648 /* The following macro is used to update an @@ -623,6 +624,9 @@ &ud->uh_dport ); } + if (ntohs(ud->uh_dport) == CUSEEME_PORT_NUMBER) + AliasHandleCUSeeMeIn(pip, original_address); + /* If UDP checksum is not zero, then adjust since destination port */ /* is being unaliased and destination port is being altered. */ if (ud->uh_sum != 0) @@ -667,6 +671,9 @@ alias_address = GetAliasAddress(link); alias_port = GetAliasPort(link); + + if (ntohs(ud->uh_dport) == CUSEEME_PORT_NUMBER) + AliasHandleCUSeeMeOut(pip, link); /* If NETBIOS Datagram, It should be alias address in UDP Data, too */ if (ntohs(ud->uh_dport) == NETBIOS_DGM_PORT_NUMBER Index: alias_local.h =================================================================== RCS file: /home/ncvs/src/lib/libalias/alias_local.h,v retrieving revision 1.5 diff -u -r1.5 alias_local.h --- alias_local.h 1998/06/06 21:52:37 1.5 +++ alias_local.h 1998/06/12 00:38:41 @@ -92,6 +92,8 @@ void AliasHandleIrcOut(struct ip *pip, struct alias_link *link, int maxsize ); void AliasHandleUdpNbt(struct ip *, struct alias_link *, struct in_addr *, u_short); void AliasHandleUdpNbtNS(struct ip *, struct alias_link *, struct in_addr *, u_short *, struct in_addr *, u_short *); +void AliasHandleCUSeeMeOut(struct ip *, struct alias_link *); +void AliasHandleCUSeeMeIn(struct ip *, struct in_addr); --==_Exmh_-12780776480-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199806211046.LAA14433>