lkml.org 
[lkml]   [1998]   [Dec]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: ARRGHH !!! Gated is broken again in 2.1.131 ...

Hello Alexey, Grabbed the patch set & applied it .
no .rej's .

But I found the below ,

#if defined(PROTO_INET)
#include <netinet/in.h>
#ifdef linux
#include <linux/sockios.h>
#include <netinet/in_systm.h>

#ifdef NOBSDSTRUCT < Is this section as it s/b ?
#include <bsd/netinet/ip.h> < I would have thought the
#else < opposite .
#include <netinet/ip.h> < Under Slackware-3.6 or RH-5.2
#endif < the bsd/netinet/* doesn't exist.

#else /* linux */
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#endif /* linux */

I am testing my version of the above out now .
With reversing the above ip.h entries it now 'make config'es
cleanly .

But I can tell you are using Glibc as the NBBY
definition problem has raised its head again .

- much later -
Ouch, I have a funny feeling that something is -very-
differant between your filesystem & mine .

Please look at the attached patch , against your changes .
they are not complete (yet) , even with this set I am having
no luck getting 3-5-10 to compile cleanly. I have also attached
the log of the make after these changes .
If these files gets to you in any other format than plain-text
please tell me .

Also find below my compile time environment. If there is anything
that I can provide please ask ..

On Thu, 24 Dec 1998 kuznet@ms2.inr.ac.ru wrote:
> Hello!
> > > Seems, I accumulated some stamina and will port it back to 3.5
> > > and prune the most weird hacks from the patch.
> > This would be a -very good- thing, And many thanks !
> > May I suggest 3-5-10 for the back porting effort, although
> > 3-5-9 would probably be cleanest .
> I put the first version to
> ftp://ftp.inr.ac.ru/ip-routing/gated-3.5.10-ss*.dif.gz
> Only BGP is tested now.
>
> > The 3-5-10 has had a
> > complete rewrite of src/krt_ifread_ioclt.c . And is causing
> > a bunch of grief,
> It does not matter, this file is not used in any case.
> Actually, 3.5.10 differs of 3.5.9 mainly by change "fucked" to "bad"
> and "shit" to "horse hockey" 8)8)8) I backed out some minor bug though.
>
> Merry Chrismas!
> Alexey Tnx, JimL
+-----------------------------------------------------------------------+
| James W. Laferriere - Network Engineer - babydr@baby-dragons.com |
| System Techniques - 25416 - 22nd S. - Des-Moines, WA 98198 |
| Give me VMS -or- Give me Linux -but- only on AXP |
+-----------------------------------------------------------------------+

-- Versions installed: (if some fields are empty or looks
-- unusual then possibly you have very old versions)
Slackware v. 3.6.0
Linux gated 2.1.131 #1 Fri Dec 11 20:19:14 PST 1998 i586 unknown
Kernel modules 2.1.121
Gnu C egcs-2.90.29 980515 (egcs-1.0.3 release)
Binutils 2.8.1.0.23
Linux C Library 5 - 5.4.46
Dynamic Linker (ld.so) 1.9.9
ls: /usr/lib/libg++.so: No such file or directory
Procps 1.2.7
Mount 2.7l
Net-tools 1.47
Kbd 0.94
Sh-utils 1.16
Flex 2.5.4
E2fsprogs 1.12
diff -ruN gated-3-5-10/src/include.h gated-3-5-10-ank+jiml/src/include.h
--- gated-3-5-10/src/include.h Thu Dec 24 19:04:43 1998
+++ gated-3-5-10-ank+jiml/src/include.h Thu Dec 24 16:53:00 1998
@@ -152,10 +152,13 @@
#ifdef linux
#include <linux/sockios.h>
#include <netinet/in_systm.h>
+#ifndef NBBY
+#include <bsd/bsd.h>
+#endif
#ifdef NOBSDSTRUCT
-#include <bsd/netinet/ip.h>
-#else
#include <netinet/ip.h>
+#else
+#include <bsd/netinet/ip.h>
#endif
#else /* linux */
#include <netinet/in_systm.h>
diff -ruN gated-3-5-10/src/rt_aggregate.c gated-3-5-10-ank+jiml/src/rt_aggregate.c
--- gated-3-5-10/src/rt_aggregate.c Thu Dec 24 19:04:44 1998
+++ gated-3-5-10-ank+jiml/src/rt_aggregate.c Thu Dec 24 17:43:05 1998
@@ -833,7 +833,12 @@
(void) fprintf(fp,
"\t\t\tAggregate: %A/%d metric %u preference %d\n",
aggr_rt->rt_dest,
+#ifdef NO_ANK_FIX
+ aggr_rt->rt_head->rt_dest_mask,
+#else
aggr_rt->rt_head->rth_dest_mask_log,
+#endif
+/* aggr_rt->rt_head->rth_dest_mask_log, */
aggr_rt->rt_metric,
aggr_rt->rt_preference);
}
@@ -871,7 +876,12 @@
fprintf(fp,
"\t\t\t\t%A/%d proto %s metric %d preference %d\n",
rta->rta_rt->rt_dest,
+#ifdef NO_ANK_FIX
+ rta->rta_rt->rt_head->rth_dest_mask,
+#else
rta->rta_rt->rt_head->rth_dest_mask_log,
+#endif
+/* rta->rta_rt->rt_head->rth_dest_mask_log, */
trace_state(rt_proto_bits, rta->rta_rt->rt_gwp->gw_proto),
rta->rta_rt->rt_metric,
rta->rta_rt->rt_head->rth_aggregate->rta_preference);
diff -ruN gated-3-5-10/src/rt_table.c gated-3-5-10-ank+jiml/src/rt_table.c
--- gated-3-5-10/src/rt_table.c Thu Dec 24 19:04:44 1998
+++ gated-3-5-10-ank+jiml/src/rt_table.c Thu Dec 24 17:45:40 1998
@@ -2885,7 +2885,12 @@

(void) fprintf(fd,
"\t%A/%d",
+#ifdef NO_ANK_FIX
+ rth->rth_dest, rth->rth_dest_mask);
+#else
rth->rth_dest, rth->rth_dest_mask_log);
+#endif
+/* rth->rth_dest, rth->rth_dest_mask_log); */
(void) fprintf(fd,
"\n\t\t\tentries %d\tannounce %d",
rth->rth_entries,cd obj.Linux-2.1.131-i586
make all
make[1]: Entering directory `/home/gated-3-5-10/src/obj.Linux-2.1.131-i586'
Make started at Thu Dec 24 17:45:48 PST 1998 with:
CC = cc
CFLAGS = -O
CWFLAGS =
IFLAGS = -DNOBSDSTRUCT -DNO_ANK_FIX
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX checksum.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX grand.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX if.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX inet.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX krt.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX krt_rtread_proc.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX krt_ifread_ioctl.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX krt_rt_ioctl.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX krt_symbols_proc.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX policy.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX rt_aggregate.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX rt_static.c
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX rt_table.c
rt_table.c: In function `rt_add':
rt_table.c:2024: warning: assignment makes pointer from integer without a cast
rt_table.c: In function `rt_change_aspath':
rt_table.c:2388: warning: assignment makes pointer from integer without a cast
cc -c -O -DNOBSDSTRUCT -DNO_ANK_FIX sockaddr.c
sockaddr.c: In function `mask_insert':
sockaddr.c:822: `mask_dup' undeclared (first use this function)
sockaddr.c:822: (Each undeclared identifier is reported only once
sockaddr.c:822: for each function it appears in.)
sockaddr.c: In function `mask_dump':
sockaddr.c:836: parse error before `{'
sockaddr.c:839: `mask' undeclared (first use this function)
sockaddr.c: At top level:
sockaddr.c:858: warning: parameter names (without types) in function declaration
sockaddr.c:858: warning: data definition has no type or storage class
sockaddr.c:860: parse error before string constant
sockaddr.c:860: warning: data definition has no type or storage class
make[1]: *** [sockaddr.o] Error 1
make[1]: Leaving directory `/home/gated-3-5-10/src/obj.Linux-2.1.131-i586'
\
 
 \ /
  Last update: 2005-03-22 13:46    [W:0.183 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site