[Olsr-cvs] olsrd-current/src build_msg.c, 1.34, 1.35 olsr_protocol.h, 1.21, 1.22 print_packet.c, 1.9, 1.10 rebuild_packet.c, 1.19, 1.20
Bernd Petrovitsch
(spam-protected)
Sun Apr 22 22:25:50 CEST 2007
Update of /cvsroot/olsrd/olsrd-current/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14900/src
Modified Files:
build_msg.c olsr_protocol.h print_packet.c rebuild_packet.c
Log Message:
* s|tcmsg|olsr_tcmsg| in preparation for a Sven-Ola patch
Index: build_msg.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/build_msg.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** build_msg.c 20 Apr 2007 13:46:04 -0000 1.34
--- build_msg.c 22 Apr 2007 20:25:48 -0000 1.35
***************
*** 604,608 ****
struct tc_mpr_addr *mprs;
union olsr_message *m;
! struct tcmsg *tc;
struct neigh_info *mprsaddr;
olsr_bool found = OLSR_FALSE, partial_sent = OLSR_FALSE;
--- 604,608 ----
struct tc_mpr_addr *mprs;
union olsr_message *m;
! struct olsr_tcmsg *tc;
struct neigh_info *mprsaddr;
olsr_bool found = OLSR_FALSE, partial_sent = OLSR_FALSE;
***************
*** 730,734 ****
struct tc_mpr_addr *mprs;
union olsr_message *m;
! struct tcmsg6 *tc6;
struct neigh_info6 *mprsaddr6;
olsr_bool found = OLSR_FALSE, partial_sent = OLSR_FALSE;
--- 730,734 ----
struct tc_mpr_addr *mprs;
union olsr_message *m;
! struct olsr_tcmsg6 *tc6;
struct neigh_info6 *mprsaddr6;
olsr_bool found = OLSR_FALSE, partial_sent = OLSR_FALSE;
Index: rebuild_packet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/rebuild_packet.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** rebuild_packet.c 28 May 2005 16:01:14 -0000 1.19
--- rebuild_packet.c 22 Apr 2007 20:25:48 -0000 1.20
***************
*** 480,484 ****
{
/* IPv4 */
! struct tcmsg *tc;
struct neigh_info *mprsaddr, *maddr;
--- 480,484 ----
{
/* IPv4 */
! struct olsr_tcmsg *tc;
struct neigh_info *mprsaddr, *maddr;
***************
*** 521,525 ****
{
/* IPv6 */
! struct tcmsg6 *tc6;
struct neigh_info6 *mprsaddr6, *maddr6;
--- 521,525 ----
{
/* IPv6 */
! struct olsr_tcmsg6 *tc6;
struct neigh_info6 *mprsaddr6, *maddr6;
Index: olsr_protocol.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_protocol.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** olsr_protocol.h 12 Jan 2006 11:00:49 -0000 1.21
--- olsr_protocol.h 22 Apr 2007 20:25:48 -0000 1.22
***************
*** 254,258 ****
! struct tcmsg
{
olsr_u16_t ansn;
--- 254,258 ----
! struct olsr_tcmsg
{
olsr_u16_t ansn;
***************
*** 273,277 ****
! struct tcmsg6
{
olsr_u16_t ansn;
--- 273,277 ----
! struct olsr_tcmsg6
{
olsr_u16_t ansn;
***************
*** 374,378 ****
{
struct hellomsg hello;
! struct tcmsg tc;
struct hnamsg hna;
struct midmsg mid;
--- 374,378 ----
{
struct hellomsg hello;
! struct olsr_tcmsg tc;
struct hnamsg hna;
struct midmsg mid;
***************
*** 398,402 ****
{
struct hellomsg6 hello;
! struct tcmsg6 tc;
struct hnamsg6 hna;
struct midmsg6 mid;
--- 398,402 ----
{
struct hellomsg6 hello;
! struct olsr_tcmsg6 tc;
struct hnamsg6 hna;
struct midmsg6 mid;
Index: print_packet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/print_packet.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** print_packet.c 7 Jan 2006 08:16:20 -0000 1.9
--- print_packet.c 22 Apr 2007 20:25:48 -0000 1.10
***************
*** 56,63 ****
static void
! print_tcmsg(FILE *, olsr_u8_t *, olsr_16_t);
static void
! print_tcmsg_lq(FILE *, olsr_u8_t *, olsr_16_t);
static void
--- 56,63 ----
static void
! print_olsr_tcmsg(FILE *, olsr_u8_t *, olsr_16_t);
static void
! print_olsr_tcmsg_lq(FILE *, olsr_u8_t *, olsr_16_t);
static void
***************
*** 132,136 ****
break;
case(TC_MESSAGE):
! print_tcmsg(handle,
(olsr_cnf->ip_version == AF_INET) ?
(olsr_u8_t *)&msg->v4.message : (olsr_u8_t *)&msg->v6.message,
--- 132,136 ----
break;
case(TC_MESSAGE):
! print_olsr_tcmsg(handle,
(olsr_cnf->ip_version == AF_INET) ?
(olsr_u8_t *)&msg->v4.message : (olsr_u8_t *)&msg->v6.message,
***************
*** 138,142 ****
break;
case(LQ_TC_MESSAGE):
! print_tcmsg_lq(handle,
(olsr_cnf->ip_version == AF_INET) ?
(olsr_u8_t *)&msg->v4.message : (olsr_u8_t *)&msg->v6.message,
--- 138,142 ----
break;
case(LQ_TC_MESSAGE):
! print_olsr_tcmsg_lq(handle,
(olsr_cnf->ip_version == AF_INET) ?
(olsr_u8_t *)&msg->v4.message : (olsr_u8_t *)&msg->v6.message,
***************
*** 324,332 ****
static void
! print_tcmsg_lq(FILE *handle, olsr_u8_t *data, olsr_16_t totsize)
{
int remsize = totsize - ((olsr_cnf->ip_version == AF_INET) ? OLSR_MSGHDRSZ_IPV4 : OLSR_MSGHDRSZ_IPV6);
! fprintf(handle, " +ANSN: %d\n", htons(((struct tcmsg *)data)->ansn));
data += 4;
--- 324,332 ----
static void
! print_olsr_tcmsg_lq(FILE *handle, olsr_u8_t *data, olsr_16_t totsize)
{
int remsize = totsize - ((olsr_cnf->ip_version == AF_INET) ? OLSR_MSGHDRSZ_IPV4 : OLSR_MSGHDRSZ_IPV6);
! fprintf(handle, " +ANSN: %d\n", htons(((struct olsr_tcmsg *)data)->ansn));
data += 4;
***************
*** 348,356 ****
static void
! print_tcmsg(FILE *handle, olsr_u8_t *data, olsr_16_t totsize)
{
int remsize = totsize - ((olsr_cnf->ip_version == AF_INET) ? OLSR_MSGHDRSZ_IPV4 : OLSR_MSGHDRSZ_IPV6);
! fprintf(handle, " +ANSN: %d\n", htons(((struct tcmsg *)data)->ansn));
data += 4;
--- 348,356 ----
static void
! print_olsr_tcmsg(FILE *handle, olsr_u8_t *data, olsr_16_t totsize)
{
int remsize = totsize - ((olsr_cnf->ip_version == AF_INET) ? OLSR_MSGHDRSZ_IPV4 : OLSR_MSGHDRSZ_IPV6);
! fprintf(handle, " +ANSN: %d\n", htons(((struct olsr_tcmsg *)data)->ansn));
data += 4;
More information about the Olsr-cvs
mailing list