proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 06:03:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[zserv] Extend Zserv header with version information and marker field

Browse Source 
2006-01-16 Paul Jakma <paul.jakma@sun.com>

	* lib/zclient.h: Update the Zserv protocol header with a version
	  field.  Define the old command field to be a 'marker', to
	  allow old Zserv and updated Zserv to be differentiated.
	  Future updates will bump the version field obviously. New
	  command field is made wider.  Try to stop using the
	  'zebra_size_t' typedef in the callbacks.
	* lib/zclient.c: Update to read/write new format header.
	* zebra/zserv.c: Ditto
This commit is contained in:
paul 2006-01-16 01:54:02 +00:00
parent c77d454661
commit c1b9800a60
6 changed files with 120 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ChangeLog
View File

@ -1,3 +1,13 @@
2006-01-16 Paul Jakma <paul.jakma@sun.com>
* zclient.h: Update the Zserv protocol header with a version
field. Define the old command field to be a 'marker', to
allow old Zserv and updated Zserv to be differentiated.
Future updates will bump the version field obviously. New
command field is made wider. Try to stop using the
'zebra_size_t' typedef in the callbacks.
* zclient.c: Update to read/write new format header.
2006-01-11 Paul Jakma <paul.jakma@sun.com> 2006-01-11 Paul Jakma <paul.jakma@sun.com>
* if.h: (struct interface) expand flags to 8 bytes. * if.h: (struct interface) expand flags to 8 bytes.

59
lib/zclient.c
View File

@ -270,6 +270,16 @@ zclient_send_message(struct zclient *zclient)
return 0; return 0;
} }
static void
zclient_create_header (struct stream *s, uint16_t command)
{
/* length placeholder, caller can update */
stream_putw (s, ZEBRA_HEADER_SIZE);
stream_putc (s, ZEBRA_HEADER_MARKER);
stream_putc (s, ZSERV_VERSION);
stream_putw (s, command);
}
/* Send simple Zebra message. */ /* Send simple Zebra message. */
static int static int
zebra_message_send (struct zclient *zclient, int command) zebra_message_send (struct zclient *zclient, int command)
@ -281,9 +291,8 @@ zebra_message_send (struct zclient *zclient, int command)
stream_reset (s); stream_reset (s);
/* Send very simple command only Zebra message. */ /* Send very simple command only Zebra message. */
stream_putw (s, 3); zclient_create_header (s, command);
stream_putc (s, command);
return zclient_send_message(zclient); return zclient_send_message(zclient);
} }
@ -423,12 +432,10 @@ zapi_ipv4_route (u_char cmd, struct zclient *zclient, struct prefix_ipv4 *p,
/* Reset stream. */ /* Reset stream. */
s = zclient->obuf; s = zclient->obuf;
stream_reset (s); stream_reset (s);
/* Length place holder. */ zclient_create_header (s, cmd);
stream_putw (s, 0);
/* Put type and nexthop. */
/* Put command, type and nexthop. */
stream_putc (s, cmd);
stream_putc (s, api->type); stream_putc (s, api->type);
stream_putc (s, api->flags); stream_putc (s, api->flags);
stream_putc (s, api->message); stream_putc (s, api->message);
@ -487,11 +494,9 @@ zapi_ipv6_route (u_char cmd, struct zclient *zclient, struct prefix_ipv6 *p,
s = zclient->obuf; s = zclient->obuf;
stream_reset (s); stream_reset (s);
/* Length place holder. */ zclient_create_header (s, cmd);
stream_putw (s, 0);
/* Put command, type and nexthop. */ /* Put type and nexthop. */
stream_putc (s, cmd);
stream_putc (s, api->type); stream_putc (s, api->type);
stream_putc (s, api->flags); stream_putc (s, api->flags);
stream_putc (s, api->message); stream_putc (s, api->message);
@ -543,13 +548,12 @@ zebra_redistribute_send (int command, struct zclient *zclient, int type)
s = zclient->obuf; s = zclient->obuf;
stream_reset(s); stream_reset(s);
/* Total length of the message. */
stream_putw (s, 4);
stream_putc (s, command); zclient_create_header (s, command);
stream_putc (s, type); stream_putc (s, type);
stream_putw_at (s, 0, stream_get_endp (s));
return zclient_send_message(zclient); return zclient_send_message(zclient);
} }
@ -794,8 +798,8 @@ zclient_read (struct thread *thread)
{ {
int ret; int ret;
size_t already; size_t already;
zebra_size_t length; uint16_t length, command;
zebra_command_t command; uint8_t marker, version;
struct zclient *zclient; struct zclient *zclient;
/* Get socket to zebra. */ /* Get socket to zebra. */
@ -826,10 +830,19 @@ zclient_read (struct thread *thread)
/* Reset to read from the beginning of the incoming packet. */ /* Reset to read from the beginning of the incoming packet. */
stream_set_getp(zclient->ibuf, 0); stream_set_getp(zclient->ibuf, 0);
/* Fetch length and command. */ /* Fetch header values. */
length = stream_getw (zclient->ibuf); length = stream_getw (zclient->ibuf);
command = stream_getc (zclient->ibuf); marker = stream_getc (zclient->ibuf);
version = stream_getc (zclient->ibuf);
command = stream_getw (zclient->ibuf);
if (marker != ZEBRA_HEADER_MARKER || version != ZSERV_VERSION)
{
zlog_err("%s: socket %d version mismatch, marker %d, version %d",
__func__, zclient->sock, marker, version);
return zclient_failed(zclient);
}
if (length < ZEBRA_HEADER_SIZE) if (length < ZEBRA_HEADER_SIZE)
{ {
zlog_err("%s: socket %d message length %u is less than %d ", zlog_err("%s: socket %d message length %u is less than %d ",

36
lib/zclient.h
View File

@ -29,7 +29,7 @@
#define ZEBRA_MAX_PACKET_SIZ 4096 #define ZEBRA_MAX_PACKET_SIZ 4096
/* Zebra header size. */ /* Zebra header size. */
#define ZEBRA_HEADER_SIZE 3 #define ZEBRA_HEADER_SIZE 6
/* Structure for the zebra client. */ /* Structure for the zebra client. */
struct zclient struct zclient
@ -68,17 +68,17 @@ struct zclient
u_char default_information; u_char default_information;
/* Pointer to the callback functions. */ /* Pointer to the callback functions. */
int (*router_id_update) (int, struct zclient *, zebra_size_t); int (*router_id_update) (int, struct zclient *, uint16_t);
int (*interface_add) (int, struct zclient *, zebra_size_t); int (*interface_add) (int, struct zclient *, uint16_t);
int (*interface_delete) (int, struct zclient *, zebra_size_t); int (*interface_delete) (int, struct zclient *, uint16_t);
int (*interface_up) (int, struct zclient *, zebra_size_t); int (*interface_up) (int, struct zclient *, uint16_t);
int (*interface_down) (int, struct zclient *, zebra_size_t); int (*interface_down) (int, struct zclient *, uint16_t);
int (*interface_address_add) (int, struct zclient *, zebra_size_t); int (*interface_address_add) (int, struct zclient *, uint16_t);
int (*interface_address_delete) (int, struct zclient *, zebra_size_t); int (*interface_address_delete) (int, struct zclient *, uint16_t);
int (*ipv4_route_add) (int, struct zclient *, zebra_size_t); int (*ipv4_route_add) (int, struct zclient *, uint16_t);
int (*ipv4_route_delete) (int, struct zclient *, zebra_size_t); int (*ipv4_route_delete) (int, struct zclient *, uint16_t);
int (*ipv6_route_add) (int, struct zclient *, zebra_size_t); int (*ipv6_route_add) (int, struct zclient *, uint16_t);
int (*ipv6_route_delete) (int, struct zclient *, zebra_size_t); int (*ipv6_route_delete) (int, struct zclient *, uint16_t);
}; };
/* Zebra API message flag. */ /* Zebra API message flag. */
@ -87,6 +87,18 @@ struct zclient
#define ZAPI_MESSAGE_DISTANCE 0x04 #define ZAPI_MESSAGE_DISTANCE 0x04
#define ZAPI_MESSAGE_METRIC 0x08 #define ZAPI_MESSAGE_METRIC 0x08
/* Zserv protocol message header */
struct zserv_header
{
uint16_t length;
uint8_t marker; /* corresponds to command field in old zserv
* always set to 255 in new zserv.
*/
uint8_t version;
#define ZSERV_VERSION 1
uint16_t command;
};
/* Zebra IPv4 route message API. */ /* Zebra IPv4 route message API. */
struct zapi_ipv4 struct zapi_ipv4
{ {

10
lib/zebra.h
View File

@ -397,6 +397,12 @@ struct in_pktinfo
#define ZEBRA_ROUTER_ID_UPDATE 22 #define ZEBRA_ROUTER_ID_UPDATE 22
#define ZEBRA_MESSAGE_MAX 23 #define ZEBRA_MESSAGE_MAX 23
/* Marker value used in new Zserv, in the byte location corresponding
* the command value in the old zserv header. To allow old and new
* Zserv headers to be distinguished from each other.
*/
#define ZEBRA_HEADER_MARKER 255
/* Zebra route's types. */ /* Zebra route's types. */
#define ZEBRA_ROUTE_SYSTEM 0 #define ZEBRA_ROUTE_SYSTEM 0
#define ZEBRA_ROUTE_KERNEL 1 #define ZEBRA_ROUTE_KERNEL 1
@ -493,9 +499,9 @@ extern char zebra_route_char(unsigned int route_type);
typedef u_int16_t afi_t; typedef u_int16_t afi_t;
typedef u_int8_t safi_t; typedef u_int8_t safi_t;
/* Zebra types. */ /* Zebra types. Used in Zserv message header. */
typedef u_int16_t zebra_size_t; typedef u_int16_t zebra_size_t;
typedef u_int8_t zebra_command_t; typedef u_int16_t zebra_command_t;
/* FIFO -- first in first out structure and macros. */ /* FIFO -- first in first out structure and macros. */
struct fifo struct fifo

4
zebra/ChangeLog
View File

@ -1,3 +1,7 @@
2006-01-16 Paul Jakma <paul.jakma@sun.com>
* zserv.c: Read/write updated Zserv header.
2006-01-11 Paul Jakma <paul.jakma@sun.com> 2006-01-11 Paul Jakma <paul.jakma@sun.com>
* zserv.c: (zsend_interface_{add,delete,update}) if flags are * zserv.c: (zsend_interface_{add,delete,update}) if flags are

76
zebra/zserv.c
View File

@ -150,6 +150,16 @@ zebra_server_send_message(struct zserv *client)
return 0; return 0;
} }
static void
zserv_create_header (struct stream *s, uint16_t cmd)
{
/* length placeholder, caller can update */
stream_putw (s, ZEBRA_HEADER_SIZE);
stream_putc (s, ZEBRA_HEADER_MARKER);
stream_putc (s, ZSERV_VERSION);
stream_putw (s, cmd);
}
/* Interface is added. Send ZEBRA_INTERFACE_ADD to client. */ /* Interface is added. Send ZEBRA_INTERFACE_ADD to client. */
/* /*
* This function is called in the following situations: * This function is called in the following situations:
@ -173,11 +183,8 @@ zsend_interface_add (struct zserv *client, struct interface *ifp)
s = client->obuf; s = client->obuf;
stream_reset (s); stream_reset (s);
/* Place holder for size. */
stream_putw (s, 0);
/* Message type. */ /* Message type. */
stream_putc (s, ZEBRA_INTERFACE_ADD); zserv_create_header (s, ZEBRA_INTERFACE_ADD);
/* Interface information. */ /* Interface information. */
stream_put (s, ifp->name, INTERFACE_NAMSIZ); stream_put (s, ifp->name, INTERFACE_NAMSIZ);
@ -214,12 +221,10 @@ zsend_interface_delete (struct zserv *client, struct interface *ifp)
s = client->obuf; s = client->obuf;
stream_reset (s); stream_reset (s);
/* Packet length placeholder. */ zserv_create_header (s, ZEBRA_INTERFACE_DELETE);
stream_putw (s, 0);
/* Interface information. */ /* Interface information. */
stream_putc (s, ZEBRA_INTERFACE_DELETE);
stream_put (s, ifp->name, INTERFACE_NAMSIZ); stream_put (s, ifp->name, INTERFACE_NAMSIZ);
stream_putl (s, ifp->ifindex); stream_putl (s, ifp->ifindex);
stream_putc (s, ifp->status); stream_putc (s, ifp->status);
@ -287,11 +292,8 @@ zsend_interface_address (int cmd, struct zserv *client,
s = client->obuf; s = client->obuf;
stream_reset (s); stream_reset (s);
/* Place holder for size. */ zserv_create_header (s, cmd);
stream_putw (s, 0);
stream_putc (s, cmd);
stream_putl (s, ifp->ifindex); stream_putl (s, ifp->ifindex);
/* Interface address flag. */ /* Interface address flag. */
@ -345,11 +347,7 @@ zsend_interface_update (int cmd, struct zserv *client, struct interface *ifp)
s = client->obuf; s = client->obuf;
stream_reset (s); stream_reset (s);
/* Place holder for size. */ zserv_create_header (s, cmd);
stream_putw (s, 0);
/* Zebra command. */
stream_putc (s, cmd);
/* Interface information. */ /* Interface information. */
stream_put (s, ifp->name, INTERFACE_NAMSIZ); stream_put (s, ifp->name, INTERFACE_NAMSIZ);
@ -403,12 +401,10 @@ zsend_route_multipath (int cmd, struct zserv *client, struct prefix *p,
s = client->obuf; s = client->obuf;
stream_reset (s); stream_reset (s);
/* Place holder for size. */ zserv_create_header (s, cmd);
stream_putw (s, 0);
/* Put type and nexthop. */
/* Put command, type and nexthop. */
stream_putc (s, cmd);
stream_putc (s, rib->type); stream_putc (s, rib->type);
stream_putc (s, rib->flags); stream_putc (s, rib->flags);
@ -523,8 +519,7 @@ zsend_ipv6_nexthop_lookup (struct zserv *client, struct in6_addr *addr)
stream_reset (s); stream_reset (s);
/* Fill in result. */ /* Fill in result. */
stream_putw (s, 0); zserv_create_header (s, ZEBRA_IPV6_NEXTHOP_LOOKUP);
stream_putc (s, ZEBRA_IPV6_NEXTHOP_LOOKUP);
stream_put (s, &addr, 16); stream_put (s, &addr, 16);
if (rib) if (rib)
@ -588,8 +583,7 @@ zsend_ipv4_nexthop_lookup (struct zserv *client, struct in_addr addr)
stream_reset (s); stream_reset (s);
/* Fill in result. */ /* Fill in result. */
stream_putw (s, 0); zserv_create_header (s, ZEBRA_IPV4_NEXTHOP_LOOKUP);
stream_putc (s, ZEBRA_IPV4_NEXTHOP_LOOKUP);
stream_put_in_addr (s, &addr); stream_put_in_addr (s, &addr);
if (rib) if (rib)
@ -647,8 +641,7 @@ zsend_ipv4_import_lookup (struct zserv *client, struct prefix_ipv4 *p)
stream_reset (s); stream_reset (s);
/* Fill in result. */ /* Fill in result. */
stream_putw (s, 0); zserv_create_header (s, ZEBRA_IPV4_IMPORT_LOOKUP);
stream_putc (s, ZEBRA_IPV4_IMPORT_LOOKUP);
stream_put_in_addr (s, &p->prefix); stream_put_in_addr (s, &p->prefix);
if (rib) if (rib)
@ -703,11 +696,8 @@ zsend_router_id_update (struct zserv *client, struct prefix *p)
s = client->obuf; s = client->obuf;
stream_reset (s); stream_reset (s);
/* Place holder for size. */
stream_putw (s, 0);
/* Message type. */ /* Message type. */
stream_putc (s, ZEBRA_ROUTER_ID_UPDATE); zserv_create_header (s, ZEBRA_ROUTER_ID_UPDATE);
/* Prefix information. */ /* Prefix information. */
stream_putc (s, p->family); stream_putc (s, p->family);
@ -1171,8 +1161,8 @@ zebra_client_read (struct thread *thread)
int sock; int sock;
struct zserv *client; struct zserv *client;
size_t already; size_t already;
u_short length; uint16_t length, command;
u_char command; uint8_t marker, version;
/* Get thread data. Reset reading thread because I'm running. */ /* Get thread data. Reset reading thread because I'm running. */
sock = THREAD_FD (thread); sock = THREAD_FD (thread);
@ -1210,9 +1200,19 @@ zebra_client_read (struct thread *thread)
/* Reset to read from the beginning of the incoming packet. */ /* Reset to read from the beginning of the incoming packet. */
stream_set_getp(client->ibuf, 0); stream_set_getp(client->ibuf, 0);
/* Fetch header values */
length = stream_getw (client->ibuf); length = stream_getw (client->ibuf);
command = stream_getc (client->ibuf); marker = stream_getc (client->ibuf);
version = stream_getc (client->ibuf);
command = stream_getw (client->ibuf);
if (marker != ZEBRA_HEADER_MARKER || version != ZSERV_VERSION)
{
zlog_err("%s: socket %d version mismatch, marker %d, version %d",
__func__, sock, marker, version);
zebra_client_close (client);
return -1;
}
if (length < ZEBRA_HEADER_SIZE) if (length < ZEBRA_HEADER_SIZE)
{ {
zlog_warn("%s: socket %d message length %u is less than header size %d", zlog_warn("%s: socket %d message length %u is less than header size %d",