proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-26 06:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge svn revision 1048 from Zebra cvs. Also add missing sokopt.h include

Browse Source 
to ospf6_network.h.
This commit is contained in:
hasso 2004-09-29 00:26:19 +00:00
parent aa0b9f912d
commit 03d52f8d6c
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ospf6d/ChangeLog
View File

@ -1,3 +1,8 @@
2004-09-25 Hasso Tepper <hasso at estpak.ee>
* ospf6_asbr.c, ospf6_lsa.c, ospf6_proto.c, ospf6_proto.h: Fix
compiler warnings.
2004-09-23 Hasso Tepper <hasso at quagga.net>
* *.[c|h]: list -> struct list *, listnode -> struct listnode *.

4
ospf6d/ospf6_asbr.c
View File

@ -383,7 +383,7 @@ ospf6_asbr_routemap_unset (int type)
}
void
ospf6_asbr_routemap_update ()
ospf6_asbr_routemap_update (char *mapname)
{
int type;
@ -460,7 +460,7 @@ ospf6_asbr_redistribute_add (int type, int ifindex, struct prefix *prefix,
if (ospf6->rmap[type].name)
{
if (ospf6->rmap[type].map == NULL)
ospf6_asbr_routemap_update ();
ospf6_asbr_routemap_update (NULL);
if (ospf6->rmap[type].map == NULL)
{
zlog_warn ("route-map \"%s\" not found, suppress redistributing",

10
ospf6d/ospf6_lsa.c
View File

@ -51,8 +51,8 @@ ospf6_unknown_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
u_char *start, *end, *current;
char byte[4];
start = (char *) lsa->header + sizeof (struct ospf6_lsa_header);
end = (char *) lsa->header + ntohs (lsa->header->length);
start = (u_char *) lsa->header + sizeof (struct ospf6_lsa_header);
end = (u_char *) lsa->header + ntohs (lsa->header->length);
vty_out (vty, " Unknown contents:%s", VNL);
for (current = start; current < end; current ++)
@ -366,8 +366,8 @@ ospf6_lsa_show_dump (struct vty *vty, struct ospf6_lsa *lsa)
u_char *start, *end, *current;
char byte[4];
start = (char *) lsa->header;
end = (char *) lsa->header + ntohs (lsa->header->length);
start = (u_char *) lsa->header;
end = (u_char *) lsa->header + ntohs (lsa->header->length);
vty_out (vty, "%s", VNL);
vty_out (vty, "%s:%s", lsa->name, VNL);
@ -670,7 +670,7 @@ ospf6_lsa_checksum (struct ospf6_lsa_header *lsa_header)
lsa_header->checksum = 0;
length = ntohs (lsa_header->length) - 2;
sp = (char *) &lsa_header->type;
sp = (u_char *) &lsa_header->type;
for (ep = sp + length; sp < ep; sp = q)
{

1
ospf6d/ospf6_network.c
View File

@ -24,6 +24,7 @@
#include "log.h"
#include "memory.h"
#include "sockunion.h"
#include "sockopt.h"
#include "privs.h"
#include "ospf6_proto.h"

2
ospf6d/ospf6_proto.c
View File

@ -70,7 +70,7 @@ ospf6_capability_printbuf (char capability, char *buf, int size)
}
void
ospf6_options_printbuf (char *options, char *buf, int size)
ospf6_options_printbuf (u_char *options, char *buf, int size)
{
char *dc, *r, *n, *mc, *e, *v6;
dc = (OSPF6_OPT_ISSET (options, OSPF6_OPT_DC) ? "DC" : "--");

2
ospf6d/ospf6_proto.h
View File

@ -116,7 +116,7 @@ void ospf6_prefix_apply_mask (struct ospf6_prefix *op);
void ospf6_prefix_options_printbuf (u_int8_t prefix_options,
char *buf, int size);
void ospf6_capability_printbuf (char capability, char *buf, int size);
void ospf6_options_printbuf (char *options, char *buf, int size);
void ospf6_options_printbuf (u_char *options, char *buf, int size);
#endif /* OSPF6_PROTO_H */