On 2007-11-20 Mathias Gug wrote:
> Hi,
>
> I've attached a debdiff to update the md5 patches.
>
> It replaces the 15_ and 20_ patches with an updated md5 patch,
> posted on quagga-dev at the end of october 2007:
> http://marc.info/?l=quagga-dev&m=119356096204723&w=2.
I'm not quite sure that your patch is enabled at all...
After patching your patch to not modify configure.ac as this
would lead to an autoreconf and a huge .diff.gz, I noticed that my version
did not compile anymore:
gcc -DHAVE_CONFIG_H -DSYSCONFDIR=\"/etc/quagga/\" -I. -I.. -I.. -I.. -I../lib
-Os -fno-omit-frame-pointer -g -std=gnu99 -Wall -Wsign-compare
-Wpointer-arith -Wbad-function-cast -Wwrite-strings -Wmissing-prototypes
-Wmissing-declarations -Wchar-subscripts -Wcast-qual -MT bgpd.o -MD -MP -MF
.deps/bgpd.Tpo -c -o bgpd.o bgpd.c
bgpd.c: In function 'peer_delete':
bgpd.c:1216: error: 'struct bgp_master' has no member named 'sock'
bgpd.c: In function 'peer_group2peer_config_copy':
bgpd.c:1444: error: 'struct bgp_master' has no member named 'sock'
bgpd.c:1452: error: 'struct bgp_master' has no member named 'sock'
bgpd.c: In function 'peer_password_set':
bgpd.c:3447: error: 'struct bgp_master' has no member named 'sock'
bgpd.c:3469: error: 'struct bgp_master' has no member named 'sock'
bgpd.c: In function 'peer_password_unset':
bgpd.c:3497: error: 'struct bgp_master' has no member named 'sock'
bgpd.c:3525: error: 'struct bgp_master' has no member named 'sock'
bgpd.c: In function 'bgp_master_init':
bgpd.c:5120: error: 'struct bgp_master' has no member named 'sock'
make: *** [bgpd.o] Error 1
So I tried to diff against your version 0.99.9-2ubuntu1, found no hint
and tried the following (notice the -E instead of "-o bgpd.o"):
..../bgpd$ gcc -DHAVE_CONFIG_H -DSYSCONFDIR=\"/etc/quagga/\" -I. -I.. -I..
-I.. -I../lib -Os -fno-omit-frame-pointer -g -std=gnu99 -Wall
-Wsign-compare -Wpointer-arith -Wbad-function-cast -Wwrite-strings
-Wmissing-prototypes -Wmissing-declarations -Wchar-subscripts -Wcast-qual -MT
bgpd.o -MD -MP -MF .deps/bgpd.Tpo -E bgpd.c > bgpd.cout
..../bgpd$ grep -A25 "^struct bgp_master$" bgpd.cout | grep -v ^$
struct bgp_master
{
struct list *bgp;
struct thread_master *master;
struct work_queue *process_main_queue;
struct work_queue *process_rsclient_queue;
u_int16_t port;
time_t start_time;
u_char options;
};
As you can see there is no "int sock". It seems that the non-unified diff
from the mailing list was applied wrong and the "int sock" definition has to
be some lines up in the code inside bgp_master. I tried that but I still
get compilation errors:
gcc -DHAVE_CONFIG_H -DSYSCONFDIR=\"/etc/quagga/\" -I. -I.. -I.. -I.. -I../lib
-Os -fno-omit-frame-pointer -g -std=gnu99 -Wall -Wsign-compare
-Wpointer-arith -Wbad-function-cast -Wwrite-strings -Wmissing-prototypes
-Wmissing-declarations -Wchar-subscripts -Wcast-qual -MT bgp_network.o -MD -MP
-MF .deps/bgp_network.Tpo -c -o bgp_network.o bgp_network.c
bgp_network.c: In function 'bgp_getsockname':
bgp_network.c:329: error: 'sock' undeclared (first use in this function)
bgp_network.c:329: error: (Each undeclared identifier is reported only once
bgp_network.c:329: error: for each function it appears in.)
make: *** [bgp_network.o] Error 1
Probably as easy to fix, too, but due to lack of time I
rather wait for 0.99.10 as I fear that I end up with one wrongly applied
line, too and cause lots of mysterious crashes for which the router admins
will behead me :)
bye,
-christian-
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
