No subject
Sat Jan 25 20:06:25 2003
Return-Path: xorp-cvs-admin@icir.org
Delivery-Date: Sat, 25 Jan 2003 20:07:07 -0800
Received: from wyvern.icir.org (wyvern.icir.org [192.150.187.14])
by tigger.icir.org (8.12.3/8.12.3) with ESMTP id h0Q477ws030802
for <atanu@tigger.icir.org>; Sat, 25 Jan 2003 20:07:07 -0800 (PST)
(envelope-from xorp-cvs-admin@icir.org)
Received: from ICSI.Berkeley.EDU (fruitcake.ICSI.Berkeley.EDU [192.150.186.11])
by wyvern.icir.org (8.12.3/8.12.3) with ESMTP id h0Q47760021373
for <atanu@icir.org>; Sat, 25 Jan 2003 20:07:07 -0800 (PST)
(envelope-from xorp-cvs-admin@icir.org)
Received: from fruitcake.icsi.Berkeley.EDU (localhost [127.0.0.1])
by ICSI.Berkeley.EDU (8.9.0/8.9.0) with ESMTP id UAA08343;
Sat, 25 Jan 2003 20:07:02 -0800 (PST)
Received: from wyvern.icir.org (wyvern.icir.org [192.150.187.14])
by ICSI.Berkeley.EDU (8.9.0/8.9.0) with ESMTP id UAA08329
for <xorp-cvs@icsi.berkeley.edu>; Sat, 25 Jan 2003 20:06:25 -0800 (PST)
Received: from xorpc.icir.org (xorpc.icir.org [192.150.187.68])
by wyvern.icir.org (8.12.3/8.12.3) with ESMTP id h0Q46P60021367
for <xorp-cvs@icir.org>; Sat, 25 Jan 2003 20:06:25 -0800 (PST)
(envelope-from pavlin@xorpc.icir.org)
Received: from xorpc.icir.org (localhost [127.0.0.1])
by xorpc.icir.org (8.12.3/8.12.3) with ESMTP id h0Q46P8a042381
for <xorp-cvs@icir.org>; Sat, 25 Jan 2003 20:06:25 -0800 (PST)
(envelope-from pavlin@xorpc.icir.org)
Received: (from pavlin@localhost)
by xorpc.icir.org (8.12.3/8.12.3/Submit) id h0Q46PLb042380;
Sat, 25 Jan 2003 20:06:25 -0800 (PST)
(envelope-from pavlin)
From: Pavlin Radoslavov <pavlin@icir.org>
Message-Id: <200301260406.h0Q46PLb042380@xorpc.icir.org>
Date: Sat, 25 Jan 2003 20:06:25 ()
To: xorp-cvs@icir.org
Reply-To: pavlin@icir.org
Subject: [Xorp-cvs] XORP cvs commit: xorp/bgp/ aspath.cc aspath.hh local_data.cc notification_packet.cc packet.cc packet.hh packet_coding_test.cc packet_test.cc path_attribute.cc peer.cc rib_ipc_handler.cc ...route_table_fanout.cc ...socket.cc ...update_packet.cc xorp/bgp/harness/ command.cc coord.cc peer.cc test_peer.cc xorp/cli/ cli_command.cc cli_node_internal_commands.cc cli_node_net.cc test_cli.cc xorp/fea/ rawsock4.cc xrl_rawsock4.cc xorp/libxipc/ finder_client.cc finder_ipc.cc finder_msg.cc finder_server.cc finder_transport.cc test_xrl_atom.cc xrl_atom.cc xrl_parser.cc xrl_pf_inproc.cc xrl_pf_stcp.cc xrl_pf_sudp.cc xorp/libxorp/ asyncio.cc exceptions.hh ipnet.hh mac.cc selector.cc test_ipnet.cc test_timer.cc xlog.c xorp/mfea/ mfea_node.cc mfea_unix_comm.cc mfea_unix_if_getifaddrs.cc mfea_unix_mrib_rawsock.cc xrl_m!
fea_node.cc!
xorp/mld6igmp/ igmp_proto.cc mld6_proto.cc mld6igmp_node.cc mld6igmp_node_cli.cc xorp/mrt/ test_mrib.cc test_mrt.cc xorp/pim/ pim_bsr.cc pim_mre_track_state.cc pim_node.cc pim_node_cli.cc pim_proto_assert.cc pim_proto_register_stop.cc pim_vif.cc xorp/rib/ fea_client.cc xorp/rtrmgr/ conf_tree_node.cc randomness.cc template_commands.cc xorp_client.cc
Sender: xorp-cvs-admin@icir.org
Errors-To: xorp-cvs-admin@icir.org
X-BeenThere: xorp-cvs@icir.org
X-Mailman-Version: 2.0
Precedence: bulk
List-Help: <mailto:xorp-cvs-request@icir.org?subject=help>
List-Post: <mailto:xorp-cvs@icir.org>
List-Subscribe: <http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-cvs>,
<mailto:xorp-cvs-request@icir.org?subject=subscribe>
List-Id: Mailing list for XORP CVS commit messages <xorp-cvs.icir.org>
List-Unsubscribe: <http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-cvs>,
<mailto:xorp-cvs-request@icir.org?subject=unsubscribe>
CVSROOT: /usr/local/share/doc/apache/cvs
Module name: xorp
Repository: xorp/rtrmgr/
Changes by: pavlin@xorpc.icir.org. 03/01/25 20:06:25
Modified files:
xorp/bgp/: aspath.cc aspath.hh local_data.cc
notification_packet.cc packet.cc packet.hh
packet_coding_test.cc packet_test.cc
path_attribute.cc peer.cc rib_ipc_handler.cc
route_table_fanout.cc socket.cc update_packet.cc
xorp/bgp/harness/: command.cc coord.cc peer.cc test_peer.cc
xorp/cli/: cli_command.cc cli_node_internal_commands.cc
cli_node_net.cc test_cli.cc
xorp/fea/: rawsock4.cc xrl_rawsock4.cc
xorp/libxipc/: finder_client.cc finder_ipc.cc finder_msg.cc
finder_server.cc finder_transport.cc
test_xrl_atom.cc xrl_atom.cc xrl_parser.cc
xrl_pf_inproc.cc xrl_pf_stcp.cc xrl_pf_sudp.cc
xorp/libxorp/: asyncio.cc exceptions.hh ipnet.hh mac.cc
selector.cc test_ipnet.cc test_timer.cc xlog.c
xorp/mfea/: mfea_node.cc mfea_unix_comm.cc
mfea_unix_if_getifaddrs.cc mfea_unix_mrib_rawsock.cc
xrl_mfea_node.cc
xorp/mld6igmp/: igmp_proto.cc mld6_proto.cc mld6igmp_node.cc
mld6igmp_node_cli.cc
xorp/mrt/: test_mrib.cc test_mrt.cc
xorp/pim/: pim_bsr.cc pim_mre_track_state.cc pim_node.cc
pim_node_cli.cc pim_proto_assert.cc
pim_proto_register_stop.cc pim_vif.cc
xorp/rib/: fea_client.cc
xorp/rtrmgr/: conf_tree_node.cc randomness.cc
template_commands.cc xorp_client.cc
Log message:
Code changes to make it (almost) compile on MacOS X version 10.2.3
with GCC version "gcc (GCC) 3.1 20020420 (prerelease)".
The changes are:
* Most of the changes are to fix the arguments to printf(3)
and friends when printing size_t argument:
OLD: printf("%d\n", my_list.size());
NEW: printf("%u\n", (uint32_t)my_list.size());
* Explicitly cast timeval.tv_sec and timeval.tv_usec
to (unsigned long) when used inside printf(3) and friends.
* Explicit cast when assigning to msghdr.msg_name:
OLD: mh.msg_name = &foo;
NEW: mh.msg_name = (caddr_t)&foo;
On FreeBSD and Linux, msghdr.msg_name is of type (void *), but
on OS X it is of type (char *), therefore the need for explicit
cast.
* Change "template <class _A>" to "template <class A>",
and propagate the change inside the template,
because the compiler didn't like underscore in front of
the class name.
* De-constify the argument to ether_ntoa(3):
OLD: ether_ntoa(&ea);
NEW: ether_ntoa(const_cast<struct ether_addr *>(&ea));
The reason is because OS X has a broken ether_ntoa() declaration
in <net/ethernet.h>, even though the manual page shows
the argument is const.
* Use "#ifdef SIOCGETSGCNT_IN6" to isolate code that uses
ioctl(SIOCGETSGCNT_IN6). This is IPv6 multicast-related,
and even though it exists in KAME, somehow it is missing
from OSX, even though it appears that OSX is using KAME's
IPv6 code. Currently, if ioctl(SIOCGETSGCNT_IN6) is missing,
the multicast code will abort at run time. In the future,
the solution should be to detect this in compilation time,
and to completely disable IPv6 compilation of the multicast
code.
* Use #ifndef SIOCGETMIFCNT_IN6 to isolate code that
uses ioctl(#ifndef SIOCGETMIFCNT_IN6).
See the above comment about SIOCGETSGCNT_IN6 for further
details.
* Use #ifdef HOST_OS_MACOSX to isolate code that uses
"struct in6_ifreq".
See the above comment about SIOCGETSGCNT_IN6 for further
details.
The only place where the compilation fails is in
bgp/harness/command.cc in assigments like:
_commands["reset"] = &Command::reset;
However, I think this is a problem with the compiler, hence
I didn't try to modify the code.
_______________________________________________
Xorp-cvs mailing list
Xorp-cvs@icir.org
http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-cvs