[Xorp-cvs] SF.net SVN: xorp:[11695] trunk/xorp/xrl
greear at users.sourceforge.net
greear at users.sourceforge.net
Fri Apr 23 09:13:31 PDT 2010
Revision: 11695
http://xorp.svn.sourceforge.net/xorp/?rev=11695&view=rev
Author: greear
Date: 2010-04-23 16:13:30 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
xif/tgt: Fix parsing of xif and tgt files on Fedora 12
All methods and target statements must now end with a semi-colon instead
of depending on cpp to not overly change the white-space & newline.
Signed-off-by: Ben Greear <greearb at candelatech.com>
Modified Paths:
--------------
trunk/xorp/xrl/interfaces/bgp.xif
trunk/xorp/xrl/interfaces/bgp_mib_traps.xif
trunk/xorp/xrl/interfaces/cli_manager.xif
trunk/xorp/xrl/interfaces/cli_processor.xif
trunk/xorp/xrl/interfaces/common.xif
trunk/xorp/xrl/interfaces/coord.xif
trunk/xorp/xrl/interfaces/datain.xif
trunk/xorp/xrl/interfaces/fea_click.xif
trunk/xorp/xrl/interfaces/fea_fib.xif
trunk/xorp/xrl/interfaces/fea_fib_client.xif
trunk/xorp/xrl/interfaces/fea_firewall.xif
trunk/xorp/xrl/interfaces/fea_ifmgr.xif
trunk/xorp/xrl/interfaces/fea_ifmgr_mirror.xif
trunk/xorp/xrl/interfaces/fea_ifmgr_replicator.xif
trunk/xorp/xrl/interfaces/fea_rawlink.xif
trunk/xorp/xrl/interfaces/fea_rawlink_client.xif
trunk/xorp/xrl/interfaces/fea_rawpkt4.xif
trunk/xorp/xrl/interfaces/fea_rawpkt4_client.xif
trunk/xorp/xrl/interfaces/fea_rawpkt6.xif
trunk/xorp/xrl/interfaces/fea_rawpkt6_client.xif
trunk/xorp/xrl/interfaces/fib2mrib.xif
trunk/xorp/xrl/interfaces/finder.xif
trunk/xorp/xrl/interfaces/finder_client.xif
trunk/xorp/xrl/interfaces/finder_event_notifier.xif
trunk/xorp/xrl/interfaces/finder_event_observer.xif
trunk/xorp/xrl/interfaces/fti.xif
trunk/xorp/xrl/interfaces/isis.xif
trunk/xorp/xrl/interfaces/mfea.xif
trunk/xorp/xrl/interfaces/mfea_client.xif
trunk/xorp/xrl/interfaces/mld6igmp.xif
trunk/xorp/xrl/interfaces/mld6igmp_client.xif
trunk/xorp/xrl/interfaces/olsr4.xif
trunk/xorp/xrl/interfaces/ospfv2.xif
trunk/xorp/xrl/interfaces/ospfv3.xif
trunk/xorp/xrl/interfaces/pim.xif
trunk/xorp/xrl/interfaces/policy.xif
trunk/xorp/xrl/interfaces/policy_backend.xif
trunk/xorp/xrl/interfaces/policy_redist4.xif
trunk/xorp/xrl/interfaces/policy_redist6.xif
trunk/xorp/xrl/interfaces/profile.xif
trunk/xorp/xrl/interfaces/profile_client.xif
trunk/xorp/xrl/interfaces/redist4.xif
trunk/xorp/xrl/interfaces/redist6.xif
trunk/xorp/xrl/interfaces/redist_transaction4.xif
trunk/xorp/xrl/interfaces/redist_transaction6.xif
trunk/xorp/xrl/interfaces/rib.xif
trunk/xorp/xrl/interfaces/rib_client.xif
trunk/xorp/xrl/interfaces/rip.xif
trunk/xorp/xrl/interfaces/ripng.xif
trunk/xorp/xrl/interfaces/rtrmgr.xif
trunk/xorp/xrl/interfaces/rtrmgr_client.xif
trunk/xorp/xrl/interfaces/socket4.xif
trunk/xorp/xrl/interfaces/socket4_user.xif
trunk/xorp/xrl/interfaces/socket6.xif
trunk/xorp/xrl/interfaces/socket6_user.xif
trunk/xorp/xrl/interfaces/static_routes.xif
trunk/xorp/xrl/interfaces/test.xif
trunk/xorp/xrl/interfaces/test_peer.xif
trunk/xorp/xrl/interfaces/test_xrls.xif
trunk/xorp/xrl/interfaces/vrrp.xif
trunk/xorp/xrl/scripts/Xif/parse.py
trunk/xorp/xrl/scripts/tgt-gen
trunk/xorp/xrl/targets/bgp.tgt
trunk/xorp/xrl/targets/bgp4_mib.tgt
trunk/xorp/xrl/targets/cli.tgt
trunk/xorp/xrl/targets/coord.tgt
trunk/xorp/xrl/targets/fea.tgt
trunk/xorp/xrl/targets/fea_ifmgr_mirror.tgt
trunk/xorp/xrl/targets/fib2mrib.tgt
trunk/xorp/xrl/targets/finder.tgt
trunk/xorp/xrl/targets/finder_client.tgt
trunk/xorp/xrl/targets/mfea.tgt
trunk/xorp/xrl/targets/mld6igmp.tgt
trunk/xorp/xrl/targets/olsr4.tgt
trunk/xorp/xrl/targets/ospfv2.tgt
trunk/xorp/xrl/targets/ospfv3.tgt
trunk/xorp/xrl/targets/pim.tgt
trunk/xorp/xrl/targets/policy.tgt
trunk/xorp/xrl/targets/profiler.tgt
trunk/xorp/xrl/targets/rib.tgt
trunk/xorp/xrl/targets/ribclient.tgt
trunk/xorp/xrl/targets/rip.tgt
trunk/xorp/xrl/targets/ripng.tgt
trunk/xorp/xrl/targets/rtrmgr.tgt
trunk/xorp/xrl/targets/show_distances.tgt
trunk/xorp/xrl/targets/show_routes.tgt
trunk/xorp/xrl/targets/static_routes.tgt
trunk/xorp/xrl/targets/test.tgt
trunk/xorp/xrl/targets/test_fea_ifmgr_mirror.tgt
trunk/xorp/xrl/targets/test_fea_rawlink.tgt
trunk/xorp/xrl/targets/test_finder_events.tgt
trunk/xorp/xrl/targets/test_peer.tgt
trunk/xorp/xrl/targets/test_socket4.tgt
trunk/xorp/xrl/targets/test_socket6.tgt
trunk/xorp/xrl/targets/test_xrls.tgt
trunk/xorp/xrl/targets/vrrp.tgt
trunk/xorp/xrl/targets/xorpsh.tgt
Modified: trunk/xorp/xrl/interfaces/bgp.xif
===================================================================
--- trunk/xorp/xrl/interfaces/bgp.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/bgp.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -7,7 +7,7 @@
/**
* Get the BGP version currently running.
*/
- get_bgp_version -> version:u32
+ get_bgp_version -> version:u32;
/**
* Get local config
@@ -20,7 +20,7 @@
? \
as:txt \
& id:ipv4 \
- & use_4byte_asnums:bool
+ & use_4byte_asnums:bool;
/**
* Set the local AS number.
@@ -28,7 +28,7 @@
* @param as our AS number.
*/
- set_local_as ? as:txt
+ set_local_as ? as:txt;
/**
* Allow 4-byte AS numbers.
@@ -36,12 +36,12 @@
* @param enable whether this is enabled.
*/
- set_4byte_as_support ? enable:bool
+ set_4byte_as_support ? enable:bool;
/**
* Get the local AS number.
*/
- get_local_as -> as:txt
+ get_local_as -> as:txt;
/**
* Set the BGP id.
@@ -49,12 +49,12 @@
* @param id our BGP ID.
*/
- set_bgp_id ? id:ipv4
+ set_bgp_id ? id:ipv4;
/**
* Get the BGP id.
*/
- get_bgp_id -> id:ipv4
+ get_bgp_id -> id:ipv4;
/**
* Confederation identifier.
@@ -65,7 +65,7 @@
set_confederation_identifier \
? \
as:txt \
- & disable:bool
+ & disable:bool;
/**
* Route reflection.
@@ -76,7 +76,7 @@
set_cluster_id \
? \
cluster_id:ipv4 \
- & disable:bool
+ & disable:bool;
/**
* Route Flap Damping. RFC 2439
@@ -93,7 +93,7 @@
& max_suppress:u32 \
& reuse:u32 \
& suppress:u32 \
- & disable:bool
+ & disable:bool;
/**
* Add peer.
@@ -115,7 +115,7 @@
& peer_port:u32 \
& as:txt \
& next_hop:ipv4 \
- & holdtime:u32
+ & holdtime:u32;
/**
* Delete peer.
@@ -130,7 +130,7 @@
local_ip:txt \
& local_port:u32 \
& peer_ip:txt \
- & peer_port:u32
+ & peer_port:u32;
/**
* Enable this peer.
@@ -145,7 +145,7 @@
local_ip:txt \
& local_port:u32 \
& peer_ip:txt \
- & peer_port:u32
+ & peer_port:u32;
/**
* Disable this peer.
@@ -160,7 +160,7 @@
local_ip:txt \
& local_port:u32 \
& peer_ip:txt \
- & peer_port:u32
+ & peer_port:u32;
/**
* Change the local IP address.
@@ -177,7 +177,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & new_local_ip:txt
+ & new_local_ip:txt;
/**
* Change the local port.
@@ -194,7 +194,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & new_local_port:u32
+ & new_local_port:u32;
/**
* Change the peer port.
@@ -211,7 +211,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & new_peer_port:u32
+ & new_peer_port:u32;
/**
* Set the peer's AS number.
@@ -228,7 +228,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & peer_as:txt
+ & peer_as:txt;
/**
* Set the holdtime
@@ -246,7 +246,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & holdtime:u32
+ & holdtime:u32;
/**
* Set the delay open time
@@ -264,7 +264,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & delay_open_time:u32
+ & delay_open_time:u32;
/**
* Set the route reflection client state. Is this peer a route
@@ -282,7 +282,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & state:bool
+ & state:bool;
/**
* Is this peer a confederation member.
@@ -299,7 +299,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & state:bool
+ & state:bool;
/**
* Set the prefix limit.
@@ -318,7 +318,7 @@
& peer_ip:txt \
& peer_port:u32 \
& maximum:u32 \
- & state:bool
+ & state:bool;
/**
* Set the peer's AS number.
@@ -335,7 +335,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & next_hop:ipv4
+ & next_hop:ipv4;
/**
* Set the IPv6 nexthop.
@@ -352,7 +352,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & next_hop:ipv6
+ & next_hop:ipv6;
/**
* Get the IPv6 nexthop.
@@ -369,7 +369,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- -> next_hop:ipv6
+ -> next_hop:ipv6;
/**
* Set the peer state enabled or disabled.
@@ -386,7 +386,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & toggle:bool
+ & toggle:bool;
/**
* Set the peer md5 password.
@@ -403,7 +403,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & password:txt
+ & password:txt;
/**
* Enable or disable the peering based on the peer state.
@@ -418,7 +418,7 @@
local_ip:txt \
& local_port:u32 \
& peer_ip:txt \
- & peer_port:u32
+ & peer_port:u32;
/**
* Set which parameters we support per peer
@@ -430,7 +430,7 @@
& peer_ip:txt \
& peer_port:u32 \
& parameter:txt \
- & toggle:bool
+ & toggle:bool;
/**
* Set next hop rewrite filter.
@@ -450,7 +450,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & next_hop:ipv4
+ & next_hop:ipv4;
/**
* Originate route IPv4
@@ -465,7 +465,7 @@
nlri:ipv4net \
& next_hop:ipv4 \
& unicast:bool \
- & multicast:bool
+ & multicast:bool;
/**
* Originate route IPv6
@@ -480,7 +480,7 @@
nlri:ipv6net \
& next_hop:ipv6 \
& unicast:bool \
- & multicast:bool
+ & multicast:bool;
/**
* Withdraw route IPv4
@@ -493,7 +493,7 @@
? \
nlri:ipv4net \
& unicast:bool \
- & multicast:bool
+ & multicast:bool;
/**
* Withdraw route IPv6
@@ -506,7 +506,7 @@
? \
nlri:ipv6net \
& unicast:bool \
- & multicast:bool
+ & multicast:bool;
/**
* Enable/Disable tracing.
@@ -515,7 +515,7 @@
* @param enable set to true to enable false to disable.
*/
trace ? tvar:txt \
- & enable:bool
+ & enable:bool;
/**
* Get the first item of a list of BGP peers
@@ -528,7 +528,7 @@
*/
get_peer_list_start -> \
token:u32 \
- & more:bool
+ & more:bool;
/**
* Get the next item of a list of BGP peers
@@ -545,7 +545,7 @@
& local_port:u32 \
& peer_ip:txt \
& peer_port:u32 \
- & more:bool
+ & more:bool;
get_peer_id \
@@ -555,7 +555,7 @@
& peer_ip:txt \
& peer_port:u32 \
-> \
- peer_id:ipv4
+ peer_id:ipv4;
get_peer_status \
? \
@@ -565,7 +565,7 @@
& peer_port:u32 \
-> \
peer_state:u32 \
- & admin_status:u32
+ & admin_status:u32;
get_peer_negotiated_version \
? \
@@ -574,7 +574,7 @@
& peer_ip:txt \
& peer_port:u32 \
-> \
- neg_version:i32
+ neg_version:i32;
get_peer_as \
? \
@@ -583,7 +583,7 @@
& peer_ip:txt \
& peer_port:u32 \
-> \
- peer_as:txt
+ peer_as:txt;
get_peer_msg_stats \
? \
@@ -597,7 +597,7 @@
& in_msgs:u32 \
& out_msgs:u32 \
& last_error:u32 \
- & in_update_elapsed:u32
+ & in_update_elapsed:u32;
get_peer_established_stats \
? \
@@ -607,7 +607,7 @@
& peer_port:u32 \
-> \
transitions:u32 \
- & established_time:u32
+ & established_time:u32;
get_peer_timer_config \
@@ -623,7 +623,7 @@
& hold_time_conf:u32 \
& keep_alive_conf:u32 \
& min_as_orgination_interval:u32 \
- & min_route_adv_interval:u32
+ & min_route_adv_interval:u32;
/**
* Register rib.
@@ -632,7 +632,7 @@
*/
register_rib \
? \
- name:txt
+ name:txt;
/**
* Get the first item of a list of BGP routes
* See RFC 1657 (BGP MIB) for full definitions of return values.
@@ -653,7 +653,7 @@
& unicast:bool \
& multicast:bool \
-> \
- token:u32
+ token:u32;
/**
* Get the first item of a list of BGP routes
@@ -675,7 +675,7 @@
& unicast:bool \
& multicast:bool \
-> \
- token:u32
+ token:u32;
/**
* Get the next route in the list
@@ -698,7 +698,7 @@
& attr_unknown:binary \
& valid:bool \
& unicast:bool \
- & multicast:bool
+ & multicast:bool;
/**
* Get the next route in the list
@@ -721,5 +721,5 @@
& attr_unknown:binary \
& valid:bool \
& unicast:bool \
- & multicast:bool
+ & multicast:bool;
}
Modified: trunk/xorp/xrl/interfaces/bgp_mib_traps.xif
===================================================================
--- trunk/xorp/xrl/interfaces/bgp_mib_traps.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/bgp_mib_traps.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -11,7 +11,7 @@
send_bgp_established_trap \
? \
bgp_last_error:txt \
- & bgp_state:u32
+ & bgp_state:u32;
/**
* Send bgpBackwardTransition trap
@@ -19,5 +19,5 @@
send_bgp_backward_transition_trap \
? \
bgp_last_error:txt \
- & bgp_state:u32
+ & bgp_state:u32;
}
Modified: trunk/xorp/xrl/interfaces/cli_manager.xif
===================================================================
--- trunk/xorp/xrl/interfaces/cli_manager.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/cli_manager.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -12,9 +12,9 @@
* @param enable if true, then enable the CLI, otherwise
* disable it.
*/
- enable_cli ? enable:bool
- start_cli
- stop_cli
+ enable_cli ? enable:bool;
+ start_cli;
+ stop_cli;
/**
* Add a subnet address to the list of subnet addresses enabled
@@ -24,8 +24,8 @@
*
* @param subnet_addr the subnet address to add.
*/
- add_enable_cli_access_from_subnet4 ? subnet_addr:ipv4net
- add_enable_cli_access_from_subnet6 ? subnet_addr:ipv6net
+ add_enable_cli_access_from_subnet4 ? subnet_addr:ipv4net;
+ add_enable_cli_access_from_subnet6 ? subnet_addr:ipv6net;
/**
* Delete a subnet address from the list of subnet addresses enabled
@@ -33,8 +33,8 @@
*
* @param subnet_addr the subnet address to delete.
*/
- delete_enable_cli_access_from_subnet4 ? subnet_addr:ipv4net
- delete_enable_cli_access_from_subnet6 ? subnet_addr:ipv6net
+ delete_enable_cli_access_from_subnet4 ? subnet_addr:ipv4net;
+ delete_enable_cli_access_from_subnet6 ? subnet_addr:ipv6net;
/**
* Add a subnet address to the list of subnet addresses disabled
@@ -44,8 +44,8 @@
*
* @param subnet_addr the subnet address to add.
*/
- add_disable_cli_access_from_subnet4 ? subnet_addr:ipv4net
- add_disable_cli_access_from_subnet6 ? subnet_addr:ipv6net
+ add_disable_cli_access_from_subnet4 ? subnet_addr:ipv4net;
+ add_disable_cli_access_from_subnet6 ? subnet_addr:ipv6net;
/**
* Delete a subnet address from the list of subnet addresses disabled
@@ -53,8 +53,8 @@
*
* @param subnet_addr the subnet address to delete.
*/
- delete_disable_cli_access_from_subnet4 ? subnet_addr:ipv4net
- delete_disable_cli_access_from_subnet6 ? subnet_addr:ipv6net
+ delete_disable_cli_access_from_subnet4 ? subnet_addr:ipv4net;
+ delete_disable_cli_access_from_subnet6 ? subnet_addr:ipv6net;
/**
* Add a CLI command to the CLI manager
@@ -76,7 +76,7 @@
& command_help:txt \
& is_command_cd:bool \
& command_cd_prompt:txt \
- & is_command_processor:bool
+ & is_command_processor:bool;
/**
* Delete a CLI command from the CLI manager
@@ -84,11 +84,11 @@
* @param processor_name the name of the module that sends the request.
* @param command_name the name of the command to delete.
*/
- delete_cli_command ? processor_name:txt & command_name:txt
+ delete_cli_command ? processor_name:txt & command_name:txt;
/*
* TODO: do we want 'add_cli_commands_done' to indicate
* end-of-adding?
*/
- /* add_cli_commands_done ? processor_name:txt */
+ /* add_cli_commands_done ? processor_name:txt;*/
}
Modified: trunk/xorp/xrl/interfaces/cli_processor.xif
===================================================================
--- trunk/xorp/xrl/interfaces/cli_processor.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/cli_processor.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -29,5 +29,5 @@
-> ret_processor_name:txt \
& ret_cli_term_name:txt \
& ret_cli_session_id:u32 \
- & ret_command_output:txt
+ & ret_command_output:txt;
}
Modified: trunk/xorp/xrl/interfaces/common.xif
===================================================================
--- trunk/xorp/xrl/interfaces/common.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/common.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -7,14 +7,14 @@
interface common/0.1 {
/** Get name of Xrl Target */
- get_target_name -> name:txt
+ get_target_name -> name:txt;
/** Get version string from Xrl Target */
- get_version -> version:txt
+ get_version -> version:txt;
/** Get status of Xrl Target */
- get_status -> status:u32 & reason:txt
+ get_status -> status:u32 & reason:txt;
/** Request clean shutdown of Xrl Target */
- shutdown
+ shutdown;
}
Modified: trunk/xorp/xrl/interfaces/coord.xif
===================================================================
--- trunk/xorp/xrl/interfaces/coord.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/coord.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -10,18 +10,18 @@
*
* @param command to be sent to the coordinator.
*/
- command ? command:txt
+ command ? command:txt;
/**
* Status, show the state of this peer.
*
*/
- status ? peer:txt -> status:txt
+ status ? peer:txt -> status:txt;
/**
* If there are still any outstanding commands pending will return
* true. Can be used to poll the coordinating process to verify that
* the previous command has completed.
*/
- pending -> pending:bool
+ pending -> pending:bool;
}
Modified: trunk/xorp/xrl/interfaces/datain.xif
===================================================================
--- trunk/xorp/xrl/interfaces/datain.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/datain.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -16,7 +16,7 @@
* @param micro. Time that the message was received in microseconds.
* @param data.
*/
- receive ? peer:txt & genid:u32 & status:bool & secs:u32 & micro:u32 & data:binary
+ receive ? peer:txt & genid:u32 & status:bool & secs:u32 & micro:u32 & data:binary;
/*
* Error. There has been an error on the endpoint.
@@ -25,7 +25,7 @@
* @param genid. The generation id.
* @param reason. The error message
*/
- error ? peer:txt & genid:u32 & reason:txt
+ error ? peer:txt & genid:u32 & reason:txt;
/*
* Closed. The endpointed has been closed.
@@ -33,5 +33,5 @@
* @param peer. The peers router name.
* @param genid. The generation id.
*/
- closed ? peer:txt & genid:u32
+ closed ? peer:txt & genid:u32;
}
Modified: trunk/xorp/xrl/interfaces/fea_click.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_click.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_click.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -9,12 +9,12 @@
/**
* Load Click FEA support.
*/
- load_click
+ load_click;
/**
* Unload Click FEA support.
*/
- unload_click
+ unload_click;
/**
* Enable/disable Click FEA support.
@@ -22,17 +22,17 @@
* @param enable if true, then enable the Click FEA support,
* otherwise disable it.
*/
- enable_click ? enable:bool
+ enable_click ? enable:bool;
/**
* Start Click FEA support.
*/
- start_click
+ start_click;
/**
* Stop Click FEA support.
*/
- stop_click
+ stop_click;
/**
* Enable/disable duplicating the Click routes to the system kernel.
@@ -40,7 +40,7 @@
* @param enable if true, then enable duplicating the Click routes
* to the system kernel, otherwise disable it.
*/
- enable_duplicate_routes_to_kernel ? enable:bool
+ enable_duplicate_routes_to_kernel ? enable:bool;
/**
* Enable/disable kernel-level Click FEA support.
@@ -48,14 +48,14 @@
* @param enable if true, then enable the kernel-level Click FEA
* support, otherwise disable it.
*/
- enable_kernel_click ? enable:bool
+ enable_kernel_click ? enable:bool;
/**
* Enable/disable installing kernel-level Click on startup.
*
* @param enable if true, then install kernel-level Click on startup.
*/
- enable_kernel_click_install_on_startup ? enable:bool
+ enable_kernel_click_install_on_startup ? enable:bool;
/**
* Specify the list of kernel Click modules to load on startup
@@ -65,14 +65,14 @@
* @param modules the list of kernel Click modules (separated by
* colon) to load.
*/
- set_kernel_click_modules ? modules:txt
+ set_kernel_click_modules ? modules:txt;
/**
* Specify the kernel-level Click mount directory.
*
* @param directory the kernel-level Click mount directory.
*/
- set_kernel_click_mount_directory ? directory:txt
+ set_kernel_click_mount_directory ? directory:txt;
/**
* Specify the external program to generate the kernel-level Click
@@ -81,7 +81,7 @@
* @param kernel_click_config_generator_file the name of the external
* program to generate the kernel-level Click configuration.
*/
- set_kernel_click_config_generator_file ? kernel_click_config_generator_file:txt
+ set_kernel_click_config_generator_file ? kernel_click_config_generator_file:txt;
/**
* Enable/disable user-level Click FEA support.
@@ -89,7 +89,7 @@
* @param enable if true, then enable the user-level Click FEA
* support, otherwise disable it.
*/
- enable_user_click ? enable:bool
+ enable_user_click ? enable:bool;
/**
* Specify the user-level Click command file.
@@ -97,7 +97,7 @@
* @param user_click_command_file the name of the user-level Click
* command file.
*/
- set_user_click_command_file ? user_click_command_file:txt
+ set_user_click_command_file ? user_click_command_file:txt;
/**
* Specify the extra arguments to the user-level Click command.
@@ -106,7 +106,7 @@
* to the user-level Click command.
*/
set_user_click_command_extra_arguments ? \
- user_click_command_extra_arguments:txt
+ user_click_command_extra_arguments:txt;
/**
* Specify whether to execute on startup the user-level Click command.
@@ -115,7 +115,7 @@
* the user-level Click command on startup.
*/
set_user_click_command_execute_on_startup ? \
- user_click_command_execute_on_startup:bool
+ user_click_command_execute_on_startup:bool;
/**
* Specify the address to use for control access to the
@@ -125,7 +125,7 @@
* control access to the user-level Click.
*/
set_user_click_control_address ? \
- user_click_control_address:ipv4
+ user_click_control_address:ipv4;
/**
* Specify the socket port to use for control access to the
@@ -135,7 +135,7 @@
* control access to the user-level Click.
*/
set_user_click_control_socket_port ? \
- user_click_control_socket_port:u32
+ user_click_control_socket_port:u32;
/**
* Specify the configuration file to be used by user-level Click
@@ -145,7 +145,7 @@
* configuration file to be used by user-level Click on startup.
*/
set_user_click_startup_config_file ? \
- user_click_startup_config_file:txt
+ user_click_startup_config_file:txt;
/**
* Specify the external program to generate the user-level Click
@@ -154,5 +154,5 @@
* @param user_click_config_generator_file the name of the external
* program to generate the user-level Click configuration.
*/
- set_user_click_config_generator_file ? user_click_config_generator_file:txt
+ set_user_click_config_generator_file ? user_click_config_generator_file:txt;
}
Modified: trunk/xorp/xrl/interfaces/fea_fib.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_fib.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_fib.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -14,16 +14,16 @@
*/
add_fib_client4 ? client_target_name:txt \
& send_updates:bool \
- & send_resolves:bool
+ & send_resolves:bool;
add_fib_client6 ? client_target_name:txt \
& send_updates:bool \
- & send_resolves:bool
+ & send_resolves:bool;
/**
* Delete a FIB client.
*
* @param client_target_name the target name of the FIB client to
* delete.
*/
- delete_fib_client4 ? client_target_name:txt
- delete_fib_client6 ? client_target_name:txt
+ delete_fib_client4 ? client_target_name:txt;
+ delete_fib_client6 ? client_target_name:txt;
}
Modified: trunk/xorp/xrl/interfaces/fea_fib_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_fib_client.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_fib_client.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -24,10 +24,10 @@
*/
add_route4 ? network:ipv4net & nexthop:ipv4 & ifname:txt \
& vifname:txt & metric:u32 & admin_distance:u32 \
- & protocol_origin:txt & xorp_route:bool
+ & protocol_origin:txt & xorp_route:bool;
add_route6 ? network:ipv6net & nexthop:ipv6 & ifname:txt \
& vifname:txt & metric:u32 & admin_distance:u32 \
- & protocol_origin:txt & xorp_route:bool
+ & protocol_origin:txt & xorp_route:bool;
/**
* Notification of a route being replaced.
@@ -48,10 +48,10 @@
*/
replace_route4 ? network:ipv4net & nexthop:ipv4 & ifname:txt \
& vifname:txt & metric:u32 & admin_distance:u32 \
- & protocol_origin:txt & xorp_route:bool
+ & protocol_origin:txt & xorp_route:bool;
replace_route6 ? network:ipv6net & nexthop:ipv6 & ifname:txt \
& vifname:txt & metric:u32 & admin_distance:u32 \
- & protocol_origin:txt & xorp_route:bool
+ & protocol_origin:txt & xorp_route:bool;
/**
* Notification of a route being deleted.
@@ -62,8 +62,8 @@
* @param vifname the name of the virtual interface toward the
* destination.
*/
- delete_route4 ? network:ipv4net & ifname:txt & vifname: txt
- delete_route6 ? network:ipv6net & ifname:txt & vifname: txt
+ delete_route4 ? network:ipv4net & ifname:txt & vifname: txt;
+ delete_route6 ? network:ipv6net & ifname:txt & vifname: txt;
/**
* Notification of a route resolution request. This is issued
@@ -74,6 +74,6 @@
* forwarding plane requires a route to be resolved by the
* upper layer.
*/
- resolve_route4 ? network:ipv4net
- resolve_route6 ? network:ipv6net
+ resolve_route4 ? network:ipv4net;
+ resolve_route6 ? network:ipv6net;
}
Modified: trunk/xorp/xrl/interfaces/fea_firewall.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_firewall.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_firewall.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -10,21 +10,21 @@
*
* @param tid the transaction ID returned by this operation.
*/
- start_transaction -> tid:u32
+ start_transaction -> tid:u32;
/**
* Commit firewall configuration transaction.
*
* @param tid the transaction ID for this operation.
*/
- commit_transaction ? tid:u32
+ commit_transaction ? tid:u32;
/**
* Abort firewall configuration transaction.
*
* @param tid the transaction ID for this operation.
*/
- abort_transaction ? tid:u32
+ abort_transaction ? tid:u32;
/**
* Add an IPv4 firewall entry.
@@ -58,7 +58,7 @@
& src_port_end:u32 \
& dst_port_begin:u32 \
& dst_port_end:u32 \
- & action:txt
+ & action:txt;
/**
* Replace an IPv4 firewall entry.
@@ -92,7 +92,7 @@
& src_port_end:u32 \
& dst_port_begin:u32 \
& dst_port_end:u32 \
- & action:txt
+ & action:txt;
/**
* Delete an IPv4 firewall entry.
@@ -122,14 +122,14 @@
& src_port_begin:u32 \
& src_port_end:u32 \
& dst_port_begin:u32 \
- & dst_port_end:u32
+ & dst_port_end:u32;
/**
* Delete all IPv4 firewall entries.
*
* @param tid the transaction ID for this operation.
*/
- delete_all_entries4 ? tid:u32
+ delete_all_entries4 ? tid:u32;
/**
* Get a token for a list of IPv4 firewall entries.
@@ -137,7 +137,7 @@
* @param token to be provided when calling get_entry_list_next4.
* @param more true if the list is not empty.
*/
- get_entry_list_start4 -> token:u32 & more:bool
+ get_entry_list_start4 -> token:u32 & more:bool;
/**
* Get the next item in a list of IPv4 firewall entries.
@@ -171,7 +171,7 @@
& dst_port_begin:u32 \
& dst_port_end:u32 \
& action:txt \
- & more:bool
+ & more:bool;
/**
* Add an IPv6 firewall entry.
@@ -205,7 +205,7 @@
& src_port_end:u32 \
& dst_port_begin:u32 \
& dst_port_end:u32 \
- & action:txt
+ & action:txt;
/**
* Replace an IPv6 firewall entry.
@@ -239,7 +239,7 @@
& src_port_end:u32 \
& dst_port_begin:u32 \
& dst_port_end:u32 \
- & action:txt
+ & action:txt;
/**
* Delete an IPv6 firewall entry.
@@ -269,14 +269,14 @@
& src_port_begin:u32 \
& src_port_end:u32 \
& dst_port_begin:u32 \
- & dst_port_end:u32
+ & dst_port_end:u32;
/**
* Delete all IPv6 firewall entries.
*
* @param tid the transaction ID for this operation.
*/
- delete_all_entries6 ? tid:u32
+ delete_all_entries6 ? tid:u32;
/**
* Get a token for a list of IPv6 firewall entries.
@@ -284,7 +284,7 @@
* @param token to be provided when calling get_entry_list_next6.
* @param more true if the list is not empty.
*/
- get_entry_list_start6 -> token:u32 & more:bool
+ get_entry_list_start6 -> token:u32 & more:bool;
/**
* Get the next item in a list of IPv6 firewall entries.
@@ -318,5 +318,5 @@
& dst_port_begin:u32 \
& dst_port_end:u32 \
& action:txt \
- & more:bool
+ & more:bool;
}
Modified: trunk/xorp/xrl/interfaces/fea_ifmgr.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_ifmgr.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_ifmgr.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -5,11 +5,11 @@
*/
interface ifmgr/0.1 {
- set_restore_original_config_on_shutdown ? enable:bool
+ set_restore_original_config_on_shutdown ? enable:bool;
- get_configured_interface_names -> ifnames:list<txt>
+ get_configured_interface_names -> ifnames:list<txt>;
- get_configured_vif_names ? ifname:txt -> vifs:list<txt>
+ get_configured_vif_names ? ifname:txt -> vifs:list<txt>;
get_configured_vif_flags ? ifname:txt \
& vif:txt \
@@ -17,17 +17,17 @@
& broadcast:bool \
& loopback:bool \
& point_to_point:bool \
- & multicast:bool
+ & multicast:bool;
get_configured_vif_pif_index ? ifname:txt \
& vif:txt \
- -> pif_index:u32
+ -> pif_index:u32;
get_configured_vif_addresses4 ? ifname:txt & vif:txt \
- -> addresses:list<ipv4>
+ -> addresses:list<ipv4>;
get_configured_vif_addresses6 ? ifname:txt & vif:txt \
- -> addresses:list<ipv4>
+ -> addresses:list<ipv4>;
get_configured_address_flags4 ? ifname:txt \
& vif:txt \
@@ -36,7 +36,7 @@
& broadcast:bool \
& loopback:bool \
& point_to_point:bool \
- & multicast:bool
+ & multicast:bool;
get_configured_address_flags6 ? ifname:txt \
& vif:txt \
@@ -44,51 +44,51 @@
-> enabled:bool \
& loopback:bool \
& point_to_point:bool \
- & multicast:bool
+ & multicast:bool;
- get_configured_interface_enabled ? ifname:txt -> enabled:bool
+ get_configured_interface_enabled ? ifname:txt -> enabled:bool;
- get_configured_interface_discard ? ifname:txt -> discard:bool
+ get_configured_interface_discard ? ifname:txt -> discard:bool;
- get_configured_interface_unreachable ? ifname:txt -> unreachable:bool
+ get_configured_interface_unreachable ? ifname:txt -> unreachable:bool;
- get_configured_interface_management ? ifname:txt -> management:bool
+ get_configured_interface_management ? ifname:txt -> management:bool;
- get_configured_mac ? ifname:txt -> mac:mac
+ get_configured_mac ? ifname:txt -> mac:mac;
- get_configured_mtu ? ifname:txt -> mtu:u32
+ get_configured_mtu ? ifname:txt -> mtu:u32;
- get_configured_no_carrier ? ifname:txt -> no_carrier:bool
+ get_configured_no_carrier ? ifname:txt -> no_carrier:bool;
- get_configured_baudrate ? ifname:txt -> baudrate:u64
+ get_configured_baudrate ? ifname:txt -> baudrate:u64;
- get_configured_vif_enabled ? ifname:txt & vif:txt -> enabled:bool
+ get_configured_vif_enabled ? ifname:txt & vif:txt -> enabled:bool;
get_configured_prefix4 ? ifname:txt & vif:txt & address:ipv4 \
- -> prefix_len:u32
+ -> prefix_len:u32;
get_configured_broadcast4 ? ifname:txt & vif:txt & address:ipv4 \
- -> broadcast:ipv4
+ -> broadcast:ipv4;
get_configured_endpoint4 ? ifname:txt & vif:txt & address:ipv4 \
- -> endpoint:ipv4
+ -> endpoint:ipv4;
get_configured_prefix6 ? ifname:txt & vif:txt & address:ipv6 \
- -> prefix_len:u32
+ -> prefix_len:u32;
get_configured_endpoint6 ? ifname:txt & vif:txt & address:ipv6 \
- -> endpoint:ipv6
+ -> endpoint:ipv6;
- start_transaction -> tid:u32
+ start_transaction -> tid:u32;
- commit_transaction ? tid:u32
+ commit_transaction ? tid:u32;
- abort_transaction ? tid:u32
+ abort_transaction ? tid:u32;
- create_interface ? tid:u32 & ifname:txt
+ create_interface ? tid:u32 & ifname:txt;
- delete_interface ? tid:u32 & ifname:txt
+ delete_interface ? tid:u32 & ifname:txt;
/**
* Implicitly configure all interfaces within the FEA by using
@@ -98,7 +98,7 @@
* @param enable if true, then enable the implicit configuration,
* otherwise disable it.
*/
- configure_all_interfaces_from_system ? tid:u32 & enable:bool
+ configure_all_interfaces_from_system ? tid:u32 & enable:bool;
/**
* Implicitly configure an interface within the FEA by using
@@ -109,27 +109,27 @@
* @param enable if true, then enable the implicit configuration,
* otherwise disable it.
*/
- configure_interface_from_system ? tid:u32 & ifname:txt & enable:bool
+ configure_interface_from_system ? tid:u32 & ifname:txt & enable:bool;
- set_interface_enabled ? tid:u32 & ifname:txt & enabled:bool
+ set_interface_enabled ? tid:u32 & ifname:txt & enabled:bool;
- set_interface_discard ? tid:u32 & ifname:txt & discard:bool
+ set_interface_discard ? tid:u32 & ifname:txt & discard:bool;
- set_interface_unreachable ? tid:u32 & ifname:txt & unreachable:bool
+ set_interface_unreachable ? tid:u32 & ifname:txt & unreachable:bool;
- set_interface_management ? tid:u32 & ifname:txt & management:bool
+ set_interface_management ? tid:u32 & ifname:txt & management:bool;
- set_mac ? tid:u32 & ifname:txt & mac:mac
+ set_mac ? tid:u32 & ifname:txt & mac:mac;
- create_mac ? ifname:txt & mac:mac
+ create_mac ? ifname:txt & mac:mac;
- delete_mac ? ifname:txt & mac:mac
+ delete_mac ? ifname:txt & mac:mac;
- restore_original_mac ? tid:u32 & ifname:txt
+ restore_original_mac ? tid:u32 & ifname:txt;
- set_mtu ? tid:u32 & ifname:txt & mtu:u32
+ set_mtu ? tid:u32 & ifname:txt & mtu:u32;
- restore_original_mtu ? tid:u32 & ifname:txt
+ restore_original_mtu ? tid:u32 & ifname:txt;
/**
* Create a vif.
@@ -139,11 +139,11 @@
* @param vif name for new vif, must be unique across all the
* vifs in the system.
*/
- create_vif ? tid:u32 & ifname:txt & vif:txt
+ create_vif ? tid:u32 & ifname:txt & vif:txt;
- delete_vif ? tid:u32 & ifname:txt & vif:txt
+ delete_vif ? tid:u32 & ifname:txt & vif:txt;
- set_vif_enabled ? tid:u32 & ifname:txt & vif:txt & enabled:bool
+ set_vif_enabled ? tid:u32 & ifname:txt & vif:txt & enabled:bool;
/**
* Set VLAN vif.
@@ -153,65 +153,65 @@
* @param vif the name of the VLAN.
* @param vlan_id the VLAN ID. It must be in the range 0 through 4095.
*/
- set_vif_vlan ? tid:u32 & ifname:txt & vif:txt & vlan_id:u32
+ set_vif_vlan ? tid:u32 & ifname:txt & vif:txt & vlan_id:u32;
- create_address4 ? tid:u32 & ifname:txt & vif:txt & address:ipv4
+ create_address4 ? tid:u32 & ifname:txt & vif:txt & address:ipv4;
- delete_address4 ? tid:u32 & ifname:txt & vif:txt & address:ipv4
+ delete_address4 ? tid:u32 & ifname:txt & vif:txt & address:ipv4;
set_address_enabled4 ? tid:u32 \
& ifname:txt \
& vif:txt \
& address:ipv4 \
- & enabled:bool
+ & enabled:bool;
get_configured_address_enabled4 ? ifname:txt \
& vif:txt \
& address:ipv4 \
- -> enabled:bool
+ -> enabled:bool;
set_prefix4 ? tid:u32 \
& ifname:txt \
& vif:txt \
& address:ipv4 \
- & prefix_len:u32
+ & prefix_len:u32;
set_broadcast4 ? tid:u32 \
& ifname:txt \
& vif:txt \
& address:ipv4 \
- & broadcast:ipv4
+ & broadcast:ipv4;
set_endpoint4 ? tid:u32 \
& ifname:txt \
& vif:txt \
& address:ipv4 \
- & endpoint:ipv4
+ & endpoint:ipv4;
- create_address6 ? tid:u32 & ifname:txt & vif:txt & address:ipv6
+ create_address6 ? tid:u32 & ifname:txt & vif:txt & address:ipv6;
- delete_address6 ? tid:u32 & ifname:txt & vif:txt & address:ipv6
+ delete_address6 ? tid:u32 & ifname:txt & vif:txt & address:ipv6;
set_address_enabled6 ? tid:u32 \
& ifname:txt \
& vif:txt \
& address:ipv6 \
- & enabled:bool
+ & enabled:bool;
get_configured_address_enabled6 ? ifname:txt \
& vif:txt \
& address:ipv6 \
- -> enabled:bool
+ -> enabled:bool;
set_prefix6 ? tid:u32 \
& ifname:txt \
& vif:txt \
& address:ipv6 \
- & prefix_len:u32
+ & prefix_len:u32;
set_endpoint6 ? tid:u32 \
& ifname:txt \
& vif:txt \
& address:ipv6 \
- & endpoint:ipv6
+ & endpoint:ipv6;
}
Modified: trunk/xorp/xrl/interfaces/fea_ifmgr_mirror.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_ifmgr_mirror.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_ifmgr_mirror.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -4,62 +4,62 @@
*/
interface fea_ifmgr_mirror/0.1 {
- interface_add ? ifname:txt
- interface_remove ? ifname:txt
- interface_set_enabled ? ifname:txt & enabled:bool
- interface_set_discard ? ifname:txt & discard:bool
- interface_set_unreachable ? ifname:txt & unreachable:bool
- interface_set_management ? ifname:txt & management:bool
- interface_set_mtu ? ifname:txt & mtu:u32
- interface_set_mac ? ifname:txt & mac:mac
- interface_set_pif_index ? ifname:txt & pif_index:u32
- interface_set_no_carrier ? ifname:txt & no_carrier:bool
- interface_set_baudrate ? ifname:txt & baudrate:u64
+ interface_add ? ifname:txt;
+ interface_remove ? ifname:txt;
+ interface_set_enabled ? ifname:txt & enabled:bool;
+ interface_set_discard ? ifname:txt & discard:bool;
+ interface_set_unreachable ? ifname:txt & unreachable:bool;
+ interface_set_management ? ifname:txt & management:bool;
+ interface_set_mtu ? ifname:txt & mtu:u32;
+ interface_set_mac ? ifname:txt & mac:mac;
+ interface_set_pif_index ? ifname:txt & pif_index:u32;
+ interface_set_no_carrier ? ifname:txt & no_carrier:bool;
+ interface_set_baudrate ? ifname:txt & baudrate:u64;
- vif_add ? ifname:txt & vifname:txt
- vif_remove ? ifname:txt & vifname:txt
- vif_set_enabled ? ifname:txt & vifname:txt & enabled:bool
- vif_set_multicast_capable ? ifname:txt & vifname:txt & capable:bool
- vif_set_broadcast_capable ? ifname:txt & vifname:txt & capable:bool
- vif_set_p2p_capable ? ifname:txt & vifname:txt & capable:bool
- vif_set_loopback ? ifname:txt & vifname:txt & loopback:bool
- vif_set_pim_register ? ifname:txt & vifname:txt & pim_register:bool
- vif_set_pif_index ? ifname:txt & vifname:txt & pif_index:u32
- vif_set_vif_index ? ifname:txt & vifname:txt & vif_index:u32
- vif_set_vlan ? ifname:txt & vifname:txt & is_vlan:bool
- vif_set_vlan_id ? ifname:txt & vifname:txt & vlan_id:u32
+ vif_add ? ifname:txt & vifname:txt;
+ vif_remove ? ifname:txt & vifname:txt;
+ vif_set_enabled ? ifname:txt & vifname:txt & enabled:bool;
+ vif_set_multicast_capable ? ifname:txt & vifname:txt & capable:bool;
+ vif_set_broadcast_capable ? ifname:txt & vifname:txt & capable:bool;
+ vif_set_p2p_capable ? ifname:txt & vifname:txt & capable:bool;
+ vif_set_loopback ? ifname:txt & vifname:txt & loopback:bool;
+ vif_set_pim_register ? ifname:txt & vifname:txt & pim_register:bool;
+ vif_set_pif_index ? ifname:txt & vifname:txt & pif_index:u32;
+ vif_set_vif_index ? ifname:txt & vifname:txt & vif_index:u32;
+ vif_set_vlan ? ifname:txt & vifname:txt & is_vlan:bool;
+ vif_set_vlan_id ? ifname:txt & vifname:txt & vlan_id:u32;
- ipv4_add ? ifname:txt & vifname:txt & addr:ipv4
- ipv4_remove ? ifname:txt & vifname:txt & addr:ipv4
- ipv4_set_prefix ? ifname:txt & vifname:txt & addr:ipv4 & prefix_len:u32
- ipv4_set_enabled ? ifname:txt & vifname:txt & addr:ipv4 & enabled:bool
+ ipv4_add ? ifname:txt & vifname:txt & addr:ipv4;
+ ipv4_remove ? ifname:txt & vifname:txt & addr:ipv4;
+ ipv4_set_prefix ? ifname:txt & vifname:txt & addr:ipv4 & prefix_len:u32;
+ ipv4_set_enabled ? ifname:txt & vifname:txt & addr:ipv4 & enabled:bool;
ipv4_set_multicast_capable ? ifname:txt & vifname:txt & addr:ipv4 \
- & capable:bool
+ & capable:bool;
ipv4_set_loopback ? ifname:txt & vifname:txt & addr:ipv4 \
- & loopback:bool
+ & loopback:bool;
ipv4_set_broadcast ? ifname:txt & vifname:txt & addr:ipv4 \
- & broadcast_addr:ipv4
+ & broadcast_addr:ipv4;
ipv4_set_endpoint ? ifname:txt & vifname:txt & addr:ipv4 \
- & endpoint_addr:ipv4
+ & endpoint_addr:ipv4;
- ipv6_add ? ifname:txt & vifname:txt & addr:ipv6
- ipv6_remove ? ifname:txt & vifname:txt & addr:ipv6
- ipv6_set_prefix ? ifname:txt & vifname:txt & addr:ipv6 & prefix_len:u32
- ipv6_set_enabled ? ifname:txt & vifname:txt & addr:ipv6 & enabled:bool
+ ipv6_add ? ifname:txt & vifname:txt & addr:ipv6;
+ ipv6_remove ? ifname:txt & vifname:txt & addr:ipv6;
+ ipv6_set_prefix ? ifname:txt & vifname:txt & addr:ipv6 & prefix_len:u32;
+ ipv6_set_enabled ? ifname:txt & vifname:txt & addr:ipv6 & enabled:bool;
ipv6_set_loopback ? ifname:txt & vifname:txt & addr:ipv6 \
- & loopback:bool
+ & loopback:bool;
ipv6_set_multicast_capable ? ifname:txt & vifname:txt & addr:ipv6 \
- & capable:bool
+ & capable:bool;
ipv6_set_endpoint ? ifname:txt & vifname:txt & addr:ipv6 \
- & endpoint_addr:ipv6
+ & endpoint_addr:ipv6;
- hint_tree_complete
- hint_updates_made
+ hint_tree_complete;
+ hint_updates_made;
}
Modified: trunk/xorp/xrl/interfaces/fea_ifmgr_replicator.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_ifmgr_replicator.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_ifmgr_replicator.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -12,10 +12,10 @@
/**
* Register remote mirror of interface state.
*/
- register_ifmgr_mirror ? clientname:txt
+ register_ifmgr_mirror ? clientname:txt;
/**
* Register remote mirror of interface state.
*/
- unregister_ifmgr_mirror ? clientname:txt
+ unregister_ifmgr_mirror ? clientname:txt;
}
Modified: trunk/xorp/xrl/interfaces/fea_rawlink.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawlink.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawlink.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -24,7 +24,7 @@
& src_address:mac \
& dst_address:mac \
& ether_type:u32 \
- & payload:binary
+ & payload:binary;
/**
* Register to receive raw link-level packets. The receiver is
@@ -52,7 +52,7 @@
& vif_name:txt \
& ether_type:u32 \
& filter_program:txt \
- & enable_multicast_loopback:bool
+ & enable_multicast_loopback:bool;
/**
* Unregister to receive raw link-level packets.
@@ -76,7 +76,7 @@
& if_name:txt \
& vif_name:txt \
& ether_type:u32 \
- & filter_program:txt
+ & filter_program:txt;
/**
* Join a MAC multicast group.
@@ -101,7 +101,7 @@
& vif_name:txt \
& ether_type:u32 \
& filter_program:txt \
- & group_address:mac
+ & group_address:mac;
/**
* Leave a MAC multicast group.
@@ -127,5 +127,5 @@
& vif_name:txt \
& ether_type:u32 \
& filter_program:txt \
- & group_address:mac
+ & group_address:mac;
}
Modified: trunk/xorp/xrl/interfaces/fea_rawlink_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawlink_client.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawlink_client.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -24,5 +24,5 @@
& src_address:mac \
& dst_address:mac \
& ether_type:u32 \
- & payload:binary
+ & payload:binary;
}
Modified: trunk/xorp/xrl/interfaces/fea_rawpkt4.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawpkt4.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawpkt4.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -37,7 +37,7 @@
& ip_tos:i32 \
& ip_router_alert:bool \
& ip_internet_control:bool \
- & payload:binary
+ & payload:binary;
/**
* Register to receive IPv4 packets. The receiver is expected to
@@ -59,7 +59,7 @@
& if_name:txt \
& vif_name:txt \
& ip_protocol:u32 \
- & enable_multicast_loopback:bool
+ & enable_multicast_loopback:bool;
/**
* Unregister to receive IPv4 packets.
@@ -77,7 +77,7 @@
unregister_receiver ? xrl_target_instance_name:txt \
& if_name:txt \
& vif_name:txt \
- & ip_protocol:u32
+ & ip_protocol:u32;
/**
* Join an IPv4 multicast group.
@@ -96,7 +96,7 @@
& if_name:txt \
& vif_name:txt \
& ip_protocol:u32 \
- & group_address:ipv4
+ & group_address:ipv4;
/**
* Leave an IPv4 multicast group.
@@ -116,5 +116,5 @@
& if_name:txt \
& vif_name:txt \
& ip_protocol:u32 \
- & group_address:ipv4
+ & group_address:ipv4;
}
Modified: trunk/xorp/xrl/interfaces/fea_rawpkt4_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawpkt4_client.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawpkt4_client.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -33,5 +33,5 @@
& ip_tos:i32 \
& ip_router_alert:bool \
& ip_internet_control:bool \
- & payload:binary
+ & payload:binary;
}
Modified: trunk/xorp/xrl/interfaces/fea_rawpkt6.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawpkt6.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawpkt6.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -44,7 +44,7 @@
& ip_internet_control:bool \
& ext_headers_type:list<u32> \
& ext_headers_payload:list<binary> \
- & payload:binary
+ & payload:binary;
/**
* Register to receive IPv6 packets. The receiver is expected to
@@ -66,7 +66,7 @@
& if_name:txt \
& vif_name:txt \
& ip_protocol:u32 \
- & enable_multicast_loopback:bool
+ & enable_multicast_loopback:bool;
/**
* Unregister to receive IPv6 packets.
@@ -84,7 +84,7 @@
unregister_receiver ? xrl_target_instance_name:txt \
& if_name:txt \
& vif_name:txt \
- & ip_protocol:u32
+ & ip_protocol:u32;
/**
* Join an IPv6 multicast group.
@@ -103,7 +103,7 @@
& if_name:txt \
& vif_name:txt \
& ip_protocol:u32 \
- & group_address:ipv6
+ & group_address:ipv6;
/**
* Leave an IPv6 multicast group.
@@ -123,5 +123,5 @@
& if_name:txt \
& vif_name:txt \
& ip_protocol:u32 \
- & group_address:ipv6
+ & group_address:ipv6;
}
Modified: trunk/xorp/xrl/interfaces/fea_rawpkt6_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawpkt6_client.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawpkt6_client.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -40,5 +40,5 @@
& ip_internet_control:bool \
& ext_headers_type:list<u32> \
& ext_headers_payload:list<binary> \
- & payload:binary
+ & payload:binary;
}
Modified: trunk/xorp/xrl/interfaces/fib2mrib.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fib2mrib.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fib2mrib.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -13,9 +13,9 @@
* @param enable if true, then enable Fib2mrib, otherwise
* disable it.
*/
- enable_fib2mrib ? enable:bool
- start_fib2mrib
- stop_fib2mrib
+ enable_fib2mrib ? enable:bool;
+ start_fib2mrib;
+ stop_fib2mrib;
/**
* Enable/disable the Fib2mrib trace log for all operations.
@@ -23,5 +23,5 @@
* @param enable if true, then enable the trace log, otherwise
* disable it.
*/
- enable_log_trace_all ? enable:bool
+ enable_log_trace_all ? enable:bool;
}
Modified: trunk/xorp/xrl/interfaces/finder.xif
===================================================================
--- trunk/xorp/xrl/interfaces/finder.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/finder.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -15,9 +15,9 @@
& class_name:txt \
& singleton:bool \
& in_cookie:txt \
- -> out_cookie:txt
+ -> out_cookie:txt;
- unregister_finder_client ? instance_name:txt
+ unregister_finder_client ? instance_name:txt;
/**
* Enable resolution of Xrls associated with target. Disabling
@@ -28,12 +28,12 @@
* Caller must be client that registered Xrl.
*/
set_finder_client_enabled ? instance_name:txt \
- & enabled:bool
+ & enabled:bool;
/**
* Get enabled state information associated with finder client.
*/
- finder_client_enabled ? instance_name:txt -> enabled:bool
+ finder_client_enabled ? instance_name:txt -> enabled:bool;
/**
* Add resolved Xrl into system, fails if xrl is already
@@ -42,49 +42,49 @@
add_xrl ? xrl:txt \
& protocol_name:txt \
& protocol_args:txt \
- -> resolved_xrl_method_name:txt
+ -> resolved_xrl_method_name:txt;
/**
* Remove xrl
*/
- remove_xrl ? xrl:txt
+ remove_xrl ? xrl:txt;
/**
* Resolve Xrl
*/
- resolve_xrl ? xrl:txt -> resolutions:list<txt>
+ resolve_xrl ? xrl:txt -> resolutions:list<txt>;
/**
* Get list of registered Xrl targets
*/
- get_xrl_targets -> target_names:list<txt>
+ get_xrl_targets -> target_names:list<txt>;
/**
* Get list of Xrls registered by target
*/
- get_xrls_registered_by ? target_name:txt -> xrls:list<txt>
+ get_xrls_registered_by ? target_name:txt -> xrls:list<txt>;
/**
* Get list of IPv4 hosts that clients should accept IPC requests
* from.
*/
- get_ipv4_permitted_hosts -> ipv4s:list<ipv4>
+ get_ipv4_permitted_hosts -> ipv4s:list<ipv4>;
/**
* Get list of IPv4 nets that clients should accept IPC requests
* from.
*/
- get_ipv4_permitted_nets -> ipv4nets:list<ipv4net>
+ get_ipv4_permitted_nets -> ipv4nets:list<ipv4net>;
/**
* Get list of IPv6 hosts that clients should accept IPC requests
* from.
*/
- get_ipv6_permitted_hosts -> ipv6s:list<ipv6>
+ get_ipv6_permitted_hosts -> ipv6s:list<ipv6>;
/**
* Get list of IPv6 nets that clients should accept IPC requests
* from.
*/
- get_ipv6_permitted_nets -> ipv6nets:list<ipv6net>
+ get_ipv6_permitted_nets -> ipv6nets:list<ipv6net>;
}
Modified: trunk/xorp/xrl/interfaces/finder_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/finder_client.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/finder_client.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -6,8 +6,9 @@
*/
interface finder_client/0.2 {
+
/** No op method used by finder to poll for liveness. */
- hello
+ hello;
/**
* Remove Xrl from cache. The client should remove currently
@@ -16,16 +17,16 @@
* information, though implementations may consult the Finder for
* updated information before.
*/
- remove_xrl_from_cache ? xrl:txt
+ remove_xrl_from_cache ? xrl:txt;
/**
* Remove all Xrls relating to target from cache.
*/
- remove_xrls_for_target_from_cache ? target_name:txt
+ remove_xrls_for_target_from_cache ? target_name:txt;
/**
* Execute tunneled Xrl. Permits finder to call methods on
* clients through FinderClient.
*/
- dispatch_tunneled_xrl ? xrl:txt -> xrl_error:u32 & xrl_error_note:txt
+ dispatch_tunneled_xrl ? xrl:txt -> xrl_error:u32 & xrl_error_note:txt;
}
Modified: trunk/xorp/xrl/interfaces/finder_event_notifier.xif
===================================================================
--- trunk/xorp/xrl/interfaces/finder_event_notifier.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/finder_event_notifier.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -22,7 +22,7 @@
* notifications for.
*/
register_class_event_interest ? requester_instance:txt \
- & class_name:txt
+ & class_name:txt;
/**
* Deregister interest in events relating to a particular class.
@@ -34,7 +34,7 @@
* notifications for.
*/
deregister_class_event_interest ? requester_instance:txt \
- & class_name:txt
+ & class_name:txt;
/**
* Register interest in events relating to a particular instance.
@@ -53,7 +53,7 @@
* notifications for.
*/
register_instance_event_interest ? requester_instance:txt \
- & instance_name:txt
+ & instance_name:txt;
/**
* Register interest in events relating to a particular instance.
*
@@ -64,5 +64,5 @@
* notifications for.
*/
deregister_instance_event_interest ? requester_instance:txt \
- & instance_name:txt
+ & instance_name:txt;
}
Modified: trunk/xorp/xrl/interfaces/finder_event_observer.xif
===================================================================
--- trunk/xorp/xrl/interfaces/finder_event_observer.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/finder_event_observer.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -11,7 +11,7 @@
* @param target_class the target class name.
* @param target_instance the target instance name.
*/
- xrl_target_birth ? target_class:txt & target_instance:txt
+ xrl_target_birth ? target_class:txt & target_instance:txt;
/**
* Announce target death to observer.
@@ -19,5 +19,5 @@
* @param target_class the target class name.
* @param target_instance the target instance name.
*/
- xrl_target_death ? target_class:txt & target_instance:txt
+ xrl_target_death ? target_class:txt & target_instance:txt;
}
Modified: trunk/xorp/xrl/interfaces/fti.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fti.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fti.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -25,7 +25,7 @@
vifname:txt & \
metric:u32 & \
admin_distance:u32 & \
- protocol_origin:txt
+ protocol_origin:txt;
/**
* Lookup a route for a destination host address.
@@ -46,7 +46,7 @@
vifname:txt & \
metric:u32 & \
admin_distance:u32 & \
- protocol_origin:txt
+ protocol_origin:txt;
/**
* Lookup a route for a destination subnet address.
@@ -67,7 +67,7 @@
vifname:txt & \
metric:u32 & \
admin_distance:u32 & \
- protocol_origin:txt
+ protocol_origin:txt;
/**
* Lookup a route for a destination subnet address.
@@ -88,7 +88,7 @@
vifname:txt & \
metric:u32 & \
admin_distance:u32 & \
- protocol_origin:txt
+ protocol_origin:txt;
/*
* TBD: start_reading and read_entry forwarding table dump methods.
@@ -102,7 +102,7 @@
* @param result true if the underlying system supports IPv4,
* otherwise false.
*/
- have_ipv4 -> result:bool
+ have_ipv4 -> result:bool;
/**
* Test if the underlying system supports IPv6.
@@ -110,7 +110,7 @@
* @param result true if the underlying system supports IPv4,
* otherwise false.
*/
- have_ipv6 -> result:bool
+ have_ipv6 -> result:bool;
/**
* Test whether the IPv4 unicast forwarding engine is enabled
@@ -119,7 +119,7 @@
* @param enabled if true, then the IPv4 unicast forwarding
* is enabled, otherwise is disabled.
*/
- get_unicast_forwarding_enabled4 -> enabled:bool
+ get_unicast_forwarding_enabled4 -> enabled:bool;
/**
* Test whether the IPv6 unicast forwarding engine is enabled
@@ -128,7 +128,7 @@
* @param enabled if true, then the IPv6 unicast forwarding
* is enabled, otherwise is disabled.
*/
- get_unicast_forwarding_enabled6 -> enabled:bool
+ get_unicast_forwarding_enabled6 -> enabled:bool;
/**
* Set the IPv4 unicast forwarding engine to enable or disable
@@ -137,7 +137,7 @@
* @param enabled if true, then enable IPv4 unicast forwarding,
* otherwise disable it.
*/
- set_unicast_forwarding_enabled4 ? enabled:bool
+ set_unicast_forwarding_enabled4 ? enabled:bool;
/**
* Set the IPv6 unicast forwarding engine to enable or disable
@@ -146,7 +146,7 @@
* @param enabled if true, then enable IPv6 unicast forwarding,
* otherwise disable it.
*/
- set_unicast_forwarding_enabled6 ? enabled:bool
+ set_unicast_forwarding_enabled6 ? enabled:bool;
/**
* Set the IPv4 unicast forwarding engine whether to retain existing
@@ -155,7 +155,7 @@
* @param retain if true, then retain the XORP forwarding entries,
* otherwise delete them.
*/
- set_unicast_forwarding_entries_retain_on_startup4 ? retain:bool
+ set_unicast_forwarding_entries_retain_on_startup4 ? retain:bool;
/**
* Set the IPv4 unicast forwarding engine whether to retain existing
@@ -164,7 +164,7 @@
* @param retain if true, then retain the XORP forwarding entries,
* otherwise delete them.
*/
- set_unicast_forwarding_entries_retain_on_shutdown4 ? retain:bool
+ set_unicast_forwarding_entries_retain_on_shutdown4 ? retain:bool;
/**
* Set the IPv6 unicast forwarding engine whether to retain existing
@@ -173,7 +173,7 @@
* @param retain if true, then retain the XORP forwarding entries,
* otherwise delete them.
*/
- set_unicast_forwarding_entries_retain_on_startup6 ? retain:bool
+ set_unicast_forwarding_entries_retain_on_startup6 ? retain:bool;
/**
* Set the IPv6 unicast forwarding engine whether to retain existing
@@ -182,7 +182,7 @@
* @param retain if true, then retain the XORP forwarding entries,
* otherwise delete them.
*/
- set_unicast_forwarding_entries_retain_on_shutdown6 ? retain:bool
+ set_unicast_forwarding_entries_retain_on_shutdown6 ? retain:bool;
/**
* Set the IPv4 unicast forwarding table ID to be used.
@@ -191,7 +191,7 @@
* otherwise the default table should be used.
* @param table_id the IPv4 unicast forwarding table ID to be used.
*/
- set_unicast_forwarding_table_id4 ? is_configured:bool & table_id:u32
+ set_unicast_forwarding_table_id4 ? is_configured:bool & table_id:u32;
/**
* Set the IPv6 unicast forwarding table ID to be used.
@@ -200,5 +200,5 @@
* otherwise the default table should be used.
* @param table_id the IPv6 unicast forwarding table ID to be used.
*/
- set_unicast_forwarding_table_id6 ? is_configured:bool & table_id:u32
+ set_unicast_forwarding_table_id6 ? is_configured:bool & table_id:u32;
}
Modified: trunk/xorp/xrl/interfaces/isis.xif
===================================================================
--- trunk/xorp/xrl/interfaces/isis.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/isis.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -11,26 +11,26 @@
* @param id our IS-IS ID. Typically a router interface address.
*
*/
- set_system_id ? id:ipv4
+ set_system_id ? id:ipv4;
/**
* Get the system ID
*/
- get_system_id -> id:ipv4
+ get_system_id -> id:ipv4;
/**
* Add an area address.
*
* @param addr area address.
*/
- add_area_address ? addr:u32
+ add_area_address ? addr:u32;
/**
* Delete an area address
*
* @param addr area address.
*/
- delete_area_address ? addr:u32
+ delete_area_address ? addr:u32;
/**
* Configure an interface for IS-IS
@@ -57,7 +57,7 @@
metric:u32 \
hello_interval:u32 \
hold_time_multiplier:u32 \
- prioriy:u32
+ prioriy:u32;
/**
* Add interface address
@@ -72,7 +72,7 @@
*/
add_interface_address_v4 ? ifname:txt \
vif:txt \
- address:ipv4
+ address:ipv4;
/**
* Delete interface address
@@ -86,7 +86,7 @@
*/
delete_interface_address_v4 ? ifname:txt \
vif:txt \
- address:ipv4
+ address:ipv4;
/**
* Add interface address
@@ -101,7 +101,7 @@
*/
add_interface_address_v6 ? ifname:txt \
vif:txt \
- address:ipv6
+ address:ipv6;
/**
* Delete interface address
@@ -115,47 +115,47 @@
*/
delete_interface_address_v6 ? ifname:txt \
vif:txt \
- address:ipv6
+ address:ipv6;
/*
* Add reachability information.
*
* @param network
*/
- add_nlri_v4 ? address:ipv4net
+ add_nlri_v4 ? address:ipv4net;
/*
* Delete reachability information.
*
* @param network
*/
- add_nlri_v4 ? address:ipv4net
+ add_nlri_v4 ? address:ipv4net;
/*
* Add reachability information.
*
* @param network
*/
- add_nlri_v6 ? address:ipv6net
+ add_nlri_v6 ? address:ipv6net;
/*
* Delete reachability information.
*
* @param network
*/
- add_nlri_v6 ? address:ipv6net
+ add_nlri_v6 ? address:ipv6net;
/**
* Interpacket Gap.
*
* @param gap Minimal time between packets in milliseconds.
*/
- interpacket_gap ? gap:u32
+ interpacket_gap ? gap:u32;
/**
* Set the overload bit in the transmitted LSP.
*
* @param enable
*/
- configure_overload ? enable:bool
+ configure_overload ? enable:bool;
}
Modified: trunk/xorp/xrl/interfaces/mfea.xif
===================================================================
--- trunk/xorp/xrl/interfaces/mfea.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/mfea.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -13,7 +13,7 @@
* @param result true if the underlying system supports IPv4
* multicast routing, otherwise false.
*/
- have_multicast_routing4 -> result:bool
+ have_multicast_routing4 -> result:bool;
/**
* Test if the underlying system supports IPv6 multicast routing.
@@ -21,7 +21,7 @@
* @param result true if the underlying system supports IPv6
* multicast routing, otherwise false.
*/
- have_multicast_routing6 -> result:bool
+ have_multicast_routing6 -> result:bool;
/**
* Register a protocol on an interface in the Multicast FEA.
@@ -38,10 +38,10 @@
*/
register_protocol4 ? xrl_sender_name:txt \
& if_name:txt & vif_name:txt \
- & ip_protocol:u32
+ & ip_protocol:u32;
register_protocol6 ? xrl_sender_name:txt \
& if_name:txt & vif_name:txt \
- & ip_protocol:u32
+ & ip_protocol:u32;
/**
* Unregister a protocol on an interface in the Multicast FEA.
@@ -55,9 +55,9 @@
* particular protocol.
*/
unregister_protocol4 ? xrl_sender_name:txt \
- & if_name:txt & vif_name:txt
+ & if_name:txt & vif_name:txt;
unregister_protocol6 ? xrl_sender_name:txt \
- & if_name:txt & vif_name:txt
+ & if_name:txt & vif_name:txt;
/**
* Add/delete a Multicast Forwarding Cache with the kernel.
@@ -80,18 +80,18 @@
& oiflist:binary \
& oiflist_disable_wrongvif:binary \
& max_vifs_oiflist:u32 \
- & rp_address:ipv4
+ & rp_address:ipv4;
add_mfc6 ? xrl_sender_name:txt \
& source_address:ipv6 & group_address:ipv6 \
& iif_vif_index:u32 \
& oiflist:binary \
& oiflist_disable_wrongvif:binary \
& max_vifs_oiflist:u32 \
- & rp_address:ipv6
+ & rp_address:ipv6;
delete_mfc4 ? xrl_sender_name:txt \
- & source_address:ipv4 & group_address:ipv4
+ & source_address:ipv4 & group_address:ipv4;
delete_mfc6 ? xrl_sender_name:txt \
- & source_address:ipv6 & group_address:ipv6
+ & source_address:ipv6 & group_address:ipv6;
/**
* Add/delete a dataflow monitor with the MFEA.
@@ -126,7 +126,7 @@
& is_threshold_in_packets:bool \
& is_threshold_in_bytes:bool \
& is_geq_upcall:bool \
- & is_leq_upcall:bool
+ & is_leq_upcall:bool;
add_dataflow_monitor6 ? xrl_sender_name:txt \
& source_address:ipv6 \
& group_address:ipv6 \
@@ -137,7 +137,7 @@
& is_threshold_in_packets:bool \
& is_threshold_in_bytes:bool \
& is_geq_upcall:bool \
- & is_leq_upcall:bool
+ & is_leq_upcall:bool;
delete_dataflow_monitor4? xrl_sender_name:txt \
& source_address:ipv4 \
& group_address:ipv4 \
@@ -148,7 +148,7 @@
& is_threshold_in_packets:bool \
& is_threshold_in_bytes:bool \
& is_geq_upcall:bool \
- & is_leq_upcall:bool
+ & is_leq_upcall:bool;
delete_dataflow_monitor6? xrl_sender_name:txt \
& source_address:ipv6 \
& group_address:ipv6 \
@@ -159,13 +159,13 @@
& is_threshold_in_packets:bool \
& is_threshold_in_bytes:bool \
& is_geq_upcall:bool \
- & is_leq_upcall:bool
+ & is_leq_upcall:bool;
delete_all_dataflow_monitor4? xrl_sender_name:txt \
& source_address:ipv4 \
- & group_address:ipv4
+ & group_address:ipv4;
delete_all_dataflow_monitor6? xrl_sender_name:txt \
& source_address:ipv6 \
- & group_address:ipv6
+ & group_address:ipv6;
/**
* Enable/disable/start/stop a MFEA vif interface.
@@ -174,9 +174,9 @@
* @param enable if true, then enable the vif, otherwise
* disable it.
*/
- enable_vif ? vif_name:txt & enable:bool
- start_vif ? vif_name:txt
- stop_vif ? vif_name:txt
+ enable_vif ? vif_name:txt & enable:bool;
+ start_vif ? vif_name:txt;
+ stop_vif ? vif_name:txt;
/**
* Enable/disable/start/stop all MFEA vif interfaces.
@@ -184,9 +184,9 @@
* @param enable if true, then enable the vifs, otherwise
* disable them.
*/
- enable_all_vifs ? enable:bool
- start_all_vifs
- stop_all_vifs
+ enable_all_vifs ? enable:bool;
+ start_all_vifs;
+ stop_all_vifs;
/**
* Enable/disable/start/stop the MFEA.
@@ -194,9 +194,9 @@
* @param enable if true, then enable the MFEA, otherwise
* disable it.
*/
- enable_mfea ? enable:bool
- start_mfea
- stop_mfea
+ enable_mfea ? enable:bool;
+ start_mfea;
+ stop_mfea;
/**
* Enable/disable/start/stop the MFEA CLI access.
@@ -204,9 +204,9 @@
* @param enable if true, then enable the MFEA CLI access, otherwise
* disable it.
*/
- enable_cli ? enable:bool
- start_cli
- stop_cli
+ enable_cli ? enable:bool;
+ start_cli;
+ stop_cli;
/**
* Enable/disable the MFEA trace log for all operations.
@@ -214,5 +214,5 @@
* @param enable if true, then enable the trace log, otherwise
* disable it.
*/
- log_trace_all ? enable:bool
+ log_trace_all ? enable:bool;
}
Modified: trunk/xorp/xrl/interfaces/mfea_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/mfea_client.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/mfea_client.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -24,13 +24,13 @@
& vif_name:txt & vif_index:u32 \
& source_address:ipv4 \
& dest_address:ipv4 \
- & protocol_message:binary
+ & protocol_message:binary;
recv_kernel_signal_message6 ? xrl_sender_name:txt \
& message_type:u32 \
& vif_name:txt & vif_index:u32 \
& source_address:ipv6 \
& dest_address:ipv6 \
- & protocol_message:binary
+ & protocol_message:binary;
/**
* A signal that a dataflow-related pre-condition is true.
@@ -75,7 +75,7 @@
& is_threshold_in_packets: bool \
& is_threshold_in_bytes: bool \
& is_geq_upcall:bool \
- & is_leq_upcall: bool
+ & is_leq_upcall: bool;
recv_dataflow_signal6 ? xrl_sender_name:txt \
& source_address:ipv6 \
& group_address:ipv6 \
@@ -90,5 +90,5 @@
& is_threshold_in_packets: bool \
& is_threshold_in_bytes: bool \
& is_geq_upcall:bool \
- & is_leq_upcall:bool
+ & is_leq_upcall:bool;
}
Modified: trunk/xorp/xrl/interfaces/mld6igmp.xif
===================================================================
--- trunk/xorp/xrl/interfaces/mld6igmp.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/mld6igmp.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -15,9 +15,9 @@
* @param enable if true, then enable the vif, otherwise
* disable it.
*/
- enable_vif ? vif_name:txt & enable:bool
- start_vif ? vif_name:txt
- stop_vif ? vif_name:txt
+ enable_vif ? vif_name:txt & enable:bool;
+ start_vif ? vif_name:txt;
+ stop_vif ? vif_name:txt;
/**
* Enable/disable/start/stop all MLD6IGMP vif interfaces.
@@ -25,9 +25,9 @@
* @param enable if true, then enable the vifs, otherwise
* disable them.
*/
- enable_all_vifs ? enable:bool
- start_all_vifs
- stop_all_vifs
+ enable_all_vifs ? enable:bool;
+ start_all_vifs;
+ stop_all_vifs;
/**
* Enable/disable/start/stop the MLD6IGMP protocol.
@@ -35,9 +35,9 @@
* @param enable if true, then enable the MLD6IGMP protocol, otherwise
* disable it.
*/
- enable_mld6igmp ? enable:bool
- start_mld6igmp
- stop_mld6igmp
+ enable_mld6igmp ? enable:bool;
+ start_mld6igmp;
+ stop_mld6igmp;
/**
* Enable/disable/start/stop the MLD6IGMP CLI access.
@@ -45,9 +45,9 @@
* @param enable if true, then enable the MLD6IGMP CLI access,
* otherwise disable it.
*/
- enable_cli ? enable:bool
- start_cli
- stop_cli
+ enable_cli ? enable:bool;
+ start_cli;
+ stop_cli;
/**
* Get the configured protocol version per interface.
@@ -55,7 +55,7 @@
* @param vif_name the name of the vif to apply to.
* @param proto_version the protocol version.
*/
- get_vif_proto_version ? vif_name:txt -> proto_version:u32
+ get_vif_proto_version ? vif_name:txt -> proto_version:u32;
/**
* Set the protocol version per interface.
@@ -63,14 +63,14 @@
* @param vif_name the name of the vif to apply to.
* @param proto_version the protocol version.
*/
- set_vif_proto_version ? vif_name:txt & proto_version:u32
+ set_vif_proto_version ? vif_name:txt & proto_version:u32;
/**
* Reset the protocol version per interface to its default value.
*
* @param vif_name the name of the vif to apply to.
*/
- reset_vif_proto_version ? vif_name:txt
+ reset_vif_proto_version ? vif_name:txt;
/**
* Get the IP Router Alert option check per interface for received
@@ -80,7 +80,7 @@
* @param enabled if true, then the IP Router Alert option check was
* enabled, otherwise it was disabled.
*/
- get_vif_ip_router_alert_option_check ? vif_name:txt -> enabled:bool
+ get_vif_ip_router_alert_option_check ? vif_name:txt -> enabled:bool;
/**
* Set the IP Router Alert option check per interface for received
@@ -90,7 +90,7 @@
* @param enable if true, then enable the IP Router Alert option check,
* otherwise disable it.
*/
- set_vif_ip_router_alert_option_check ? vif_name:txt & enable:bool
+ set_vif_ip_router_alert_option_check ? vif_name:txt & enable:bool;
/**
* Reset the IP Router Alert option check for received packets per
@@ -98,7 +98,7 @@
*
* @param vif_name the name of the vif to apply to.
*/
- reset_vif_ip_router_alert_option_check ? vif_name:txt
+ reset_vif_ip_router_alert_option_check ? vif_name:txt;
/**
* Get the Query Interval per interface.
@@ -110,7 +110,7 @@
*/
get_vif_query_interval ? vif_name:txt \
-> interval_sec:u32 \
- & interval_usec:u32
+ & interval_usec:u32;
/**
* Set the Query Interval per interface.
@@ -122,14 +122,14 @@
*/
set_vif_query_interval ? vif_name:txt \
& interval_sec:u32 \
- & interval_usec:u32
+ & interval_usec:u32;
/**
* Reset the Query Interval per interface to its default value.
*
* @param vif_name the name of the vif to apply to.
*/
- reset_vif_query_interval ? vif_name:txt
+ reset_vif_query_interval ? vif_name:txt;
/**
* Get the Last Member Query Interval per interface.
@@ -141,7 +141,7 @@
*/
get_vif_query_last_member_interval ? vif_name:txt \
-> interval_sec:u32 \
- & interval_usec:u32
+ & interval_usec:u32;
/**
* Set the Last Member Query Interval per interface.
@@ -153,7 +153,7 @@
*/
set_vif_query_last_member_interval ? vif_name:txt \
& interval_sec:u32 \
- & interval_usec:u32
+ & interval_usec:u32;
/**
* Reset the Last Member Query Interval per interface to its
@@ -161,7 +161,7 @@
*
* @param vif_name the name of the vif to apply to.
*/
- reset_vif_query_last_member_interval ? vif_name:txt
+ reset_vif_query_last_member_interval ? vif_name:txt;
/**
* Get the Query Response Interval per interface.
@@ -173,7 +173,7 @@
*/
get_vif_query_response_interval ? vif_name:txt \
-> interval_sec:u32 \
- & interval_usec:u32
+ & interval_usec:u32;
/**
* Set the Query Response Interval per interface.
@@ -185,7 +185,7 @@
*/
set_vif_query_response_interval ? vif_name:txt \
& interval_sec:u32 \
- & interval_usec:u32
+ & interval_usec:u32;
/**
* Reset the Query Response Interval per interface to its
@@ -193,7 +193,7 @@
*
* @param vif_name the name of the vif to apply to.
*/
- reset_vif_query_response_interval ? vif_name:txt
+ reset_vif_query_response_interval ? vif_name:txt;
/**
* Get the Robustness Variable count per interface.
@@ -202,7 +202,7 @@
* @param robust_count the count value.
*/
get_vif_robust_count ? vif_name:txt \
- -> robust_count:u32
+ -> robust_count:u32;
/**
* Set the Robustness Variable count per interface.
@@ -211,7 +211,7 @@
* @param robust_count the count value.
*/
set_vif_robust_count ? vif_name:txt \
- & robust_count:u32
+ & robust_count:u32;
/**
* Reset the Robustness Variable count per interface to its
@@ -219,7 +219,7 @@
*
* @param vif_name the name of the vif to apply to.
*/
- reset_vif_robust_count ? vif_name:txt
+ reset_vif_robust_count ? vif_name:txt;
/**
* Enable/disable the MLD6IGMP trace log for all operations.
@@ -227,7 +227,7 @@
* @param enable if true, then enable the trace log, otherwise
* disable it.
*/
- log_trace_all ? enable:bool
+ log_trace_all ? enable:bool;
/**
* Add/delete a client protocol in the MLD/IGMP protocol.
@@ -247,15 +247,15 @@
/* TODO: the protocol names have to be globally defined */
add_protocol4 ? xrl_sender_name:txt \
& protocol_name:txt & protocol_id:u32 \
- & vif_name:txt & vif_index:u32
+ & vif_name:txt & vif_index:u32;
add_protocol6 ? xrl_sender_name:txt \
& protocol_name:txt & protocol_id:u32 \
- & vif_name:txt & vif_index:u32
+ & vif_name:txt & vif_index:u32;
delete_protocol4 ? xrl_sender_name:txt \
& protocol_name:txt & protocol_id:u32 \
- & vif_name:txt & vif_index:u32
+ & vif_name:txt & vif_index:u32;
delete_protocol6 ? xrl_sender_name:txt \
& protocol_name:txt & protocol_id:u32 \
- & vif_name:txt & vif_index:u32
+ & vif_name:txt & vif_index:u32;
}
Modified: trunk/xorp/xrl/interfaces/mld6igmp_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/mld6igmp_client.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/mld6igmp_client.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -18,14 +18,14 @@
*/
add_membership4 ? xrl_sender_name:txt \
& vif_name:txt & vif_index:u32 \
- & source:ipv4 & group:ipv4
+ & source:ipv4 & group:ipv4;
add_membership6 ? xrl_sender_name:txt \
& vif_name:txt & vif_index:u32 \
- & source:ipv6 & group:ipv6
+ & source:ipv6 & group:ipv6;
delete_membership4 ? xrl_sender_name:txt \
& vif_name:txt & vif_index:u32 \
- & source:ipv4 & group:ipv4
+ & source:ipv4 & group:ipv4;
delete_membership6 ? xrl_sender_name:txt \
& vif_name:txt & vif_index:u32 \
- & source:ipv6 & group:ipv6
+ & source:ipv6 & group:ipv6;
}
Modified: trunk/xorp/xrl/interfaces/olsr4.xif
===================================================================
--- trunk/xorp/xrl/interfaces/olsr4.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/olsr4.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -18,7 +18,7 @@
* @param enable set to true to enable, false to disable.
*/
trace ? tvar:txt \
- & enable:bool
+ & enable:bool;
/*
@@ -28,7 +28,7 @@
/**
* Clear all OLSR protocol databases.
*/
- clear_database
+ clear_database;
/*
@@ -40,24 +40,24 @@
*
* @param willingness the new willingness-to-forward.
*/
- set_willingness ? willingness:u32
+ set_willingness ? willingness:u32;
/**
* Get the willingness-to-forward.
*/
- get_willingness -> willingness:u32
+ get_willingness -> willingness:u32;
/**
* Set the MPR_COVERAGE.
*
* @param coverage the new MPR_COVERAGE value.
*/
- set_mpr_coverage ? coverage:u32
+ set_mpr_coverage ? coverage:u32;
/**
* Get the MPR_COVERAGE.
*/
- get_mpr_coverage -> coverage:u32
+ get_mpr_coverage -> coverage:u32;
/**
* Set the TC_REDUNDANCY.
@@ -65,34 +65,34 @@
* @param coverage the new TC_REDUNDANCY value as follows:
* "mprs" "mprs-and-selectors" "all"
*/
- set_tc_redundancy ? redundancy:txt
+ set_tc_redundancy ? redundancy:txt;
/**
* Get the TC_REDUNDANCY.
*/
- get_tc_redundancy -> redundancy:txt
+ get_tc_redundancy -> redundancy:txt;
/**
* Enable/disable TC fisheye mode.
*
* @param enabled true to enable fisheye, false to disable it.
*/
- set_tc_fisheye ? enabled:bool
+ set_tc_fisheye ? enabled:bool;
/**
* Get the current TC fisheye mode.
*/
- get_tc_fisheye -> enabled:bool
+ get_tc_fisheye -> enabled:bool;
/**
* Set the current HNA base cost metric.
*/
- set_hna_base_cost ? metric:u32
+ set_hna_base_cost ? metric:u32;
/**
* Get the current HNA base cost metric.
*/
- get_hna_base_cost -> metric:u32
+ get_hna_base_cost -> metric:u32;
/*
@@ -104,84 +104,84 @@
*
* @param interval the new HELLO_INTERVAL.
*/
- set_hello_interval ? interval:u32
+ set_hello_interval ? interval:u32;
/**
* Get the HELLO_INTERVAL.
*/
- get_hello_interval -> interval:u32
+ get_hello_interval -> interval:u32;
/**
* Set the REFRESH_INTERVAL.
*
* @param interval the new REFRESH_INTERVAL.
*/
- set_refresh_interval ? interval:u32
+ set_refresh_interval ? interval:u32;
/**
* Get the REFRESH_INTERVAL.
*/
- get_refresh_interval -> interval:u32
+ get_refresh_interval -> interval:u32;
/**
* Set the TC_INTERVAL.
*
* @param interval the new TC_INTERVAL.
*/
- set_tc_interval ? interval:u32
+ set_tc_interval ? interval:u32;
/**
* Get the TC_INTERVAL.
*/
- get_tc_interval -> interval:u32
+ get_tc_interval -> interval:u32;
/**
* Set the MID_INTERVAL.
*
* @param interval the new MID_INTERVAL.
*/
- set_mid_interval ? interval:u32
+ set_mid_interval ? interval:u32;
/**
* Get the MID_INTERVAL.
*/
- get_mid_interval -> interval:u32
+ get_mid_interval -> interval:u32;
/**
* Set the HNA_INTERVAL.
*
* @param interval the new HNA_INTERVAL.
*/
- set_hna_interval ? interval:u32
+ set_hna_interval ? interval:u32;
/**
* Get the HNA_INTERVAL.
*/
- get_hna_interval -> interval:u32
+ get_hna_interval -> interval:u32;
/**
* Set the DUP_HOLD_TIME.
*
* @param dup_hold_time the new DUP_HOLD_TIME.
*/
- set_dup_hold_time ? dup_hold_time:u32
+ set_dup_hold_time ? dup_hold_time:u32;
/**
* Get the DUP_HOLD_TIME.
*/
- get_dup_hold_time -> dup_hold_time:u32
+ get_dup_hold_time -> dup_hold_time:u32;
/**
* Set the main address.
*
* @param addr Our main IPv4 address which OLSR uses as a router ID.
*/
- set_main_address ? addr:ipv4
+ set_main_address ? addr:ipv4;
/**
* Get the main address.
*/
- get_main_address -> addr:ipv4
+ get_main_address -> addr:ipv4;
/*
@@ -217,7 +217,7 @@
& local_addr:ipv4 \
& local_port:u32 \
& all_nodes_addr:ipv4 \
- & all_nodes_port:u32
+ & all_nodes_port:u32;
/**
* Destroy an IPv4 address binding for OLSR.
@@ -226,7 +226,7 @@
* @param vifname the vif to unbind.
*/
unbind_address ? ifname:txt \
- & vifname:txt
+ & vifname:txt;
/**
* Set the enabled state of an IPv4 address binding for OLSR.
@@ -239,7 +239,7 @@
*/
set_binding_enabled ? ifname:txt \
& vifname:txt \
- & enabled:bool
+ & enabled:bool;
/**
* Get the state of an IPv4 address binding for OLSR.
@@ -251,7 +251,7 @@
*/
get_binding_enabled ? ifname:txt \
& vifname:txt \
- -> enabled:bool
+ -> enabled:bool;
/**
* Change the UDP address and port where OLSR listens for
@@ -268,7 +268,7 @@
change_local_addr_port ? ifname:txt \
& vifname:txt \
& local_addr:ipv4 \
- & local_port:u32
+ & local_port:u32;
/**
* Change the address where OLSR sends control traffic
@@ -286,7 +286,7 @@
change_all_nodes_addr_port ? ifname:txt \
& vifname:txt \
& all_nodes_addr:ipv4 \
- & all_nodes_port:u32
+ & all_nodes_port:u32;
/*
* Interface properties.
@@ -298,7 +298,7 @@
* Return a list of u32 type values. Each value is an internal
* ID that can be used with the get_interface_info XRL.
*/
- get_interface_list -> interfaces:list<u32>
+ get_interface_list -> interfaces:list<u32>;
/**
* Get the per-interface information for the given interface.
@@ -318,7 +318,7 @@
& local_addr:ipv4 \
& local_port:u32 \
& all_nodes_addr:ipv4 \
- & all_nodes_port:u32
+ & all_nodes_port:u32;
/**
* Set the edge cost of an interface/vif.
@@ -329,7 +329,7 @@
*/
set_interface_cost ? ifname:txt \
& vifname:txt \
- & cost:u32
+ & cost:u32;
/**
* Get the per-interface statistics for the given interface.
@@ -356,7 +356,7 @@
& messages_from_self:u32 \
& unknown_messages:u32 \
& duplicates:u32 \
- & forwarded:u32
+ & forwarded:u32;
/*
@@ -369,7 +369,7 @@
* Return a list of u32 type values. Each value is an internal
* ID that can be used with the get_link_info XRL.
*/
- get_link_list -> links:list<u32>
+ get_link_list -> links:list<u32>;
/**
* Get the information for a one-hop link.
@@ -397,7 +397,7 @@
& link_type:u32 \
& sym_time:u32 \
& asym_time:u32 \
- & hold_time:u32
+ & hold_time:u32;
/**
* Get the list of one-hop neighbors.
@@ -405,7 +405,7 @@
* Return a list of u32 type values. Each value is an internal
* ID that can be used with the get_neighbor_info XRL.
*/
- get_neighbor_list -> neighbors:list<u32>
+ get_neighbor_list -> neighbors:list<u32>;
/**
* Get the information for a one-hop neighbor.
@@ -436,7 +436,7 @@
& is_advertised:bool \
& is_sym:bool \
& is_mpr:bool \
- & is_mpr_selector:bool
+ & is_mpr_selector:bool;
/**
* Get the list of two-hop links.
@@ -444,7 +444,7 @@
* Return a list of u32 type values. Each value is an internal
* ID that can be used with the get_twohop_link_info XRL.
*/
- get_twohop_link_list -> twohop_links:list<u32>
+ get_twohop_link_list -> twohop_links:list<u32>;
/**
* Get the information for a two-hop link.
@@ -464,7 +464,7 @@
last_face_id:u32 \
& nexthop_addr:ipv4 \
& dest_addr:ipv4 \
- & hold_time:u32
+ & hold_time:u32;
/**
* Get the list of two-hop neighbors.
@@ -472,7 +472,7 @@
* Return a list of u32 type values. Each value is an internal
* ID that can be used with the get_twohop_neighbor_info XRL.
*/
- get_twohop_neighbor_list -> twohop_neighbors:list<u32>
+ get_twohop_neighbor_list -> twohop_neighbors:list<u32>;
/**
* Get the information for a two-hop neighbor.
@@ -494,7 +494,7 @@
& is_strict:bool \
& link_count:u32 \
& reachability:u32 \
- & coverage:u32
+ & coverage:u32;
/**
* Get the list of learned Multiple Interface Declaration (MID)
@@ -503,7 +503,7 @@
* Return a list of u32 type values. Each value is an internal
* ID that can be used with the get_mid_entry XRL.
*/
- get_mid_entry_list -> mid_entries:list<u32>
+ get_mid_entry_list -> mid_entries:list<u32>;
/**
* Get the information contained in a MID entry.
@@ -520,7 +520,7 @@
main_addr:ipv4 \
& iface_addr:ipv4 \
& distance:u32 \
- & hold_time:u32
+ & hold_time:u32;
/**
* Get the list of learned Topology Control (TC) entries.
@@ -528,7 +528,7 @@
* Return a list of u32 type values. Each value is an internal
* ID that can be used with the get_tc_entry XRL.
*/
- get_tc_entry_list -> tc_entries:list<u32>
+ get_tc_entry_list -> tc_entries:list<u32>;
/**
* Get the information contained in a TC entry.
@@ -547,7 +547,7 @@
& lasthop:ipv4 \
& distance:u32 \
& seqno:u32 \
- & hold_time:u32
+ & hold_time:u32;
/**
* Get the list of learned external route (HNA) entries.
@@ -555,7 +555,7 @@
* Return a list of u32 type values. Each value is an internal
* ID that can be used with the get_hna_entry XRL.
*/
- get_hna_entry_list -> hna_entries:list<u32>
+ get_hna_entry_list -> hna_entries:list<u32>;
/**
* Get the information contained in a HNA entry.
@@ -572,5 +572,5 @@
destination:ipv4net \
& lasthop:ipv4 \
& distance:u32 \
- & hold_time:u32
+ & hold_time:u32;
}
Modified: trunk/xorp/xrl/interfaces/ospfv2.xif
===================================================================
--- trunk/xorp/xrl/interfaces/ospfv2.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/ospfv2.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -9,17 +9,17 @@
/**
* Set router id
*/
- set_router_id ? id:ipv4
+ set_router_id ? id:ipv4;
/**
* Set RFC 1583 compatibility.
*/
- set_rfc1583_compatibility ? compatibility:bool
+ set_rfc1583_compatibility ? compatibility:bool;
/**
* Set the router alert in the IP options.
*/
- set_ip_router_alert ? ip_router_alert:bool
+ set_ip_router_alert ? ip_router_alert:bool;
/**
* Create an area.
@@ -28,7 +28,7 @@
* @param type of area "border", "stub", "nssa"
*/
create_area_router ? area:ipv4 \
- & type:txt
+ & type:txt;
/**
* Change area type.
@@ -37,14 +37,14 @@
* @param type of area "border", "stub", "nssa"
*/
change_area_router_type ? area:ipv4 \
- & type:txt
+ & type:txt;
/**
* Destroy area.
*
* @param area id of the area
*/
- destroy_area_router ? area:ipv4
+ destroy_area_router ? area:ipv4;
/**
* Create a binding to an interface.
@@ -58,21 +58,21 @@
& vifname:txt \
& addr:ipv4 \
& type:txt \
- & area:ipv4
+ & area:ipv4;
/**
* Delete peer.
*
*/
delete_peer ? ifname:txt \
- & vifname:txt
+ & vifname:txt;
/**
* Set the peer state up or down.
*/
set_peer_state ? ifname:txt \
& vifname:txt \
- & enable:bool
+ & enable:bool;
/**
* Add a neighbour to the peer.
@@ -81,7 +81,7 @@
& vifname:txt \
& area:ipv4 \
& neighbour_address:ipv4 \
- & neighbour_id:ipv4
+ & neighbour_id:ipv4;
/**
* Remove a neighbour from the peer.
@@ -90,7 +90,7 @@
& vifname:txt \
& area:ipv4 \
& neighbour_address:ipv4 \
- & neighbour_id:ipv4
+ & neighbour_id:ipv4;
/**
* Create a virtual link.
@@ -101,14 +101,14 @@
* be checked by the protocol.
*/
create_virtual_link ? neighbour_id:ipv4 \
- & area:ipv4
+ & area:ipv4;
/**
* Delete virtual link
*
* @param neighbour_id the router ID of the other end of the link.
*/
- delete_virtual_link ? neighbour_id:ipv4
+ delete_virtual_link ? neighbour_id:ipv4;
/**
* The area through which the virtual link transits.
@@ -117,7 +117,7 @@
* @param transit_area that the virtual link transits.
*/
transit_area_virtual_link ? neighbour_id:ipv4 \
- & transit_area:ipv4
+ & transit_area:ipv4;
/**
* The edge cost of this interface.
@@ -125,7 +125,7 @@
set_interface_cost ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & cost:u32
+ & cost:u32;
/**
* RxmtInterval
@@ -142,7 +142,7 @@
set_retransmit_interval ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & interval:u32
+ & interval:u32;
/**
* The estimated number of seconds it takes to transmit a Link
@@ -155,14 +155,14 @@
set_inftransdelay ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & delay:u32
+ & delay:u32;
/**
* Used in the designated router election.
*/
set_router_priority ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & priority:u32
+ & priority:u32;
/**
* The interval between hello messages.
@@ -170,7 +170,7 @@
set_hello_interval ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & interval:u32
+ & interval:u32;
/**
* The period to wait before considering a router dead.
@@ -178,7 +178,7 @@
set_router_dead_interval ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & interval:u32
+ & interval:u32;
/**
* Set simple password authentication key.
@@ -191,7 +191,7 @@
set_simple_authentication_key ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & password:txt
+ & password:txt;
/**
* Delete simple password authentication key.
@@ -202,7 +202,7 @@
*/
delete_simple_authentication_key ? ifname:txt \
& vifname:txt \
- & area:ipv4
+ & area:ipv4;
/**
* Set MD5 authentication key.
@@ -225,7 +225,7 @@
& password:txt \
& start_time:txt \
& end_time:txt \
- & max_time_drift:u32
+ & max_time_drift:u32;
/**
* Delete MD5 authentication key.
@@ -238,7 +238,7 @@
delete_md5_authentication_key ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & key_id:u32
+ & key_id:u32;
/**
@@ -248,47 +248,47 @@
& vifname:txt \
& area:ipv4 \
& passive:bool \
- & host:bool
+ & host:bool;
/**
* If this is a "stub" or "nssa" area toggle the sending of a
* default route.
*/
originate_default_route ? area:ipv4 \
- & enable:bool
+ & enable:bool;
/**
* Set the StubDefaultCost, the default cost sent in a default route in
* a "stub" or "nssa" area.
*/
stub_default_cost ? area:ipv4 \
- & cost:u32
+ & cost:u32;
/**
* Toggle the sending of summaries into "stub" or "nssa" areas.
*/
summaries ? area:ipv4 \
- & enable:bool
+ & enable:bool;
/**
* Add area range.
*/
area_range_add ? area:ipv4 \
& net:ipv4net \
- & advertise:bool
+ & advertise:bool;
/**
* Delete area range.
*/
area_range_delete ? area:ipv4 \
- & net:ipv4net \
+ & net:ipv4net;
/**
* Change the advertised state of this area.
*/
area_range_change_state ? area:ipv4 \
& net:ipv4net \
- & advertise:bool
+ & advertise:bool;
/**
@@ -298,7 +298,7 @@
* @param enable set to true to enable false to disable.
*/
trace ? tvar:txt \
- & enable:bool
+ & enable:bool;
/**
* Get a single lsa from an area.
@@ -321,14 +321,14 @@
valid:bool \
& toohigh:bool \
& self:bool \
- & lsa:binary
+ & lsa:binary;
/**
* Get a list of all the configured areas.
*
* Return a list of u32 type values. Each value is an area ID.
*/
- get_area_list -> areas:list<u32>
+ get_area_list -> areas:list<u32>;
/**
* Get the list of neighbours.
@@ -336,7 +336,7 @@
* Return a list of u32 type values. Each value is an internal
* identifier that can be used with the get_neighbour_info XRL.
*/
- get_neighbour_list -> areas:list<u32>
+ get_neighbour_list -> areas:list<u32>;
/**
* Get information on a neighbour.
@@ -369,10 +369,10 @@
& dr:ipv4 \
& bdr:ipv4 \
& up:u32 \
- & adjacent:u32
+ & adjacent:u32;
/**
* Clear the OSPF database.
*/
- clear_database
+ clear_database;
}
Modified: trunk/xorp/xrl/interfaces/ospfv3.xif
===================================================================
--- trunk/xorp/xrl/interfaces/ospfv3.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/ospfv3.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -9,17 +9,17 @@
/**
* Set instance id
*/
- set_instance_id ? id:u32
+ set_instance_id ? id:u32;
/**
* Set router id
*/
- set_router_id ? id:ipv4
+ set_router_id ? id:ipv4;
/**
* Set the router alert in the IP options.
*/
- set_ip_router_alert ? ip_router_alert:bool
+ set_ip_router_alert ? ip_router_alert:bool;
/**
* Create an area.
@@ -28,7 +28,7 @@
* @param type of area "border", "stub", "nssa"
*/
create_area_router ? area:ipv4 \
- & type:txt
+ & type:txt;
/**
* Change area type.
@@ -37,14 +37,14 @@
* @param type of area "border", "stub", "nssa"
*/
change_area_router_type ? area:ipv4 \
- & type:txt
+ & type:txt;
/**
* Destroy area.
*
* @param area id of the area
*/
- destroy_area_router ? area:ipv4
+ destroy_area_router ? area:ipv4;
/**
* Create a binding to an interface.
@@ -57,20 +57,20 @@
create_peer ? ifname:txt \
& vifname:txt \
& type:txt \
- & area:ipv4
+ & area:ipv4;
/**
* Delete peer.
*/
delete_peer ? ifname:txt \
- & vifname:txt
+ & vifname:txt;
/**
* Set the peer state up or down.
*/
set_peer_state ? ifname:txt \
& vifname:txt \
- & enable:bool
+ & enable:bool;
/**
* Add an address to the peer.
@@ -78,7 +78,7 @@
add_address_peer ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & addr:ipv6
+ & addr:ipv6;
/**
* Remove an address from the peer.
@@ -86,7 +86,7 @@
remove_address_peer ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & addr:ipv6
+ & addr:ipv6;
/**
* Set the address state up or down.
@@ -95,7 +95,7 @@
& vifname:txt \
& area:ipv4 \
& addr:ipv6 \
- & enable:bool
+ & enable:bool;
/**
* Activate peer.
@@ -103,7 +103,7 @@
*/
activate_peer ? ifname:txt \
& vifname:txt \
- & area:ipv4
+ & area:ipv4;
/**
* Update peer.
@@ -111,7 +111,7 @@
*/
update_peer ? ifname:txt \
& vifname:txt \
- & area:ipv4
+ & area:ipv4;
/**
* Add a neighbour to the peer.
@@ -120,7 +120,7 @@
& vifname:txt \
& area:ipv4 \
& neighbour_address:ipv6 \
- & neighbour_id:ipv4
+ & neighbour_id:ipv4;
/**
* Remove a neighbour from the peer.
@@ -129,7 +129,7 @@
& vifname:txt \
& area:ipv4 \
& neighbour_address:ipv6 \
- & neighbour_id:ipv4
+ & neighbour_id:ipv4;
/**
* Create a virtual link.
@@ -140,14 +140,14 @@
* be checked by the protocol.
*/
create_virtual_link ? neighbour_id:ipv4 \
- & area:ipv4
+ & area:ipv4;
/**
* Delete virtual link
*
* @param neighbour_id the router ID of the other end of the link.
*/
- delete_virtual_link ? neighbour_id:ipv4
+ delete_virtual_link ? neighbour_id:ipv4;
/**
* The area through which the virtual link transits.
@@ -156,7 +156,7 @@
* @param transit_area that the virtual link transits.
*/
transit_area_virtual_link ? neighbour_id:ipv4 \
- & transit_area:ipv4
+ & transit_area:ipv4;
/**
* The edge cost of this interface.
@@ -164,7 +164,7 @@
set_interface_cost ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & cost:u32
+ & cost:u32;
/**
* RxmtInterval
@@ -181,7 +181,7 @@
set_retransmit_interval ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & interval:u32
+ & interval:u32;
/**
* The estimated number of seconds it takes to transmit a Link
@@ -194,7 +194,7 @@
set_inftransdelay ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & delay:u32
+ & delay:u32;
/**
* Used in the designated router election.
@@ -202,7 +202,7 @@
set_router_priority ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & priority:u32
+ & priority:u32;
/**
* The interval between hello messages.
@@ -210,7 +210,7 @@
set_hello_interval ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & interval:u32
+ & interval:u32;
/**
* The period to wait before considering a router dead.
@@ -218,54 +218,54 @@
set_router_dead_interval ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & interval:u32
+ & interval:u32;
/**
* Toggle the passive status of an interface.
*/
set_passive ? ifname:txt \
& vifname:txt \
& area:ipv4 \
- & passive:bool
+ & passive:bool;
/**
* If this is a "stub" or "nssa" area toggle the sending of a
* default route.
*/
originate_default_route ? area:ipv4 \
- & enable:bool
+ & enable:bool;
/**
* Set the StubDefaultCost, the default cost sent in a default route in
* a "stub" or "nssa" area.
*/
stub_default_cost ? area:ipv4 \
- & cost:u32
+ & cost:u32;
/**
* Toggle the sending of summaries into "stub" or "nssa" areas.
*/
summaries ? area:ipv4 \
- & enable:bool
+ & enable:bool;
/**
* Add area range.
*/
area_range_add ? area:ipv4 \
& net:ipv6net \
- & advertise:bool
+ & advertise:bool;
/**
* Delete area range.
*/
area_range_delete ? area:ipv4 \
- & net:ipv6net \
+ & net:ipv6net;
/**
* Change the advertised state of this area.
*/
area_range_change_state ? area:ipv4 \
& net:ipv6net \
- & advertise:bool
+ & advertise:bool;
/**
@@ -275,7 +275,7 @@
* @param enable set to true to enable false to disable.
*/
trace ? tvar:txt \
- & enable:bool
+ & enable:bool;
/**
* Get a single lsa from an area.
@@ -298,14 +298,14 @@
valid:bool \
& toohigh:bool \
& self:bool \
- & lsa:binary
+ & lsa:binary;
/**
* Get a list of all the configured areas.
*
* Return a list of u32 type values. Each value is an area ID.
*/
- get_area_list -> areas:list<u32>
+ get_area_list -> areas:list<u32>;
/**
* Get the list of neighbours.
@@ -313,7 +313,7 @@
* Return a list of u32 type values. Each value is an internal
* identifier that can be used with the get_neighbour_info XRL.
*/
- get_neighbour_list -> areas:list<u32>
+ get_neighbour_list -> areas:list<u32>;
/**
* Get information on a neighbour.
@@ -346,10 +346,10 @@
& dr:ipv4 \
& bdr:ipv4 \
& up:u32 \
- & adjacent:u32
+ & adjacent:u32;
/**
* Clear the OSPF database.
*/
- clear_database
+ clear_database;
}
Modified: trunk/xorp/xrl/interfaces/pim.xif
===================================================================
--- trunk/xorp/xrl/interfaces/pim.xif 2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/pim.xif 2010-04-23 16:13:30 UTC (rev 11695)
@@ -14,9 +14,9 @@
* @param enable if true, then enable the vif, otherwise
* disable it.
*/
- enable_vif ? vif_name:txt & enable:bool
- start_vif ? vif_name:txt
- stop_vif ? vif_name:txt
+ enable_vif ? vif_name:txt & enable:bool;
+ start_vif ? vif_name:txt;
+ stop_vif ? vif_name:txt;
/**
* Enable/disable/start/stop all PIM vif interfaces.
@@ -24,9 +24,9 @@
* @param enable if true, then enable the vifs, otherwise
* disable them.
*/
- enable_all_vifs ? enable:bool
- start_all_vifs
- stop_all_vifs
+ enable_all_vifs ? enable:bool;
+ start_all_vifs;
+ stop_all_vifs;
/**
* Enable/disable/start/stop the PIM protocol.
@@ -34,9 +34,9 @@
* @param enable if true, then enable the PIM protocol, otherwise
* disable it.
*/
- enable_pim ? enable:bool
- start_pim
- stop_pim
+ enable_pim ? enable:bool;
+ start_pim;
+ stop_pim;
/**
* Enable/disable/start/stop the PIM CLI access.
@@ -44,9 +44,9 @@
* @param enable if true, then enable the PIM CLI access,
* otherwise disable it.
*/
- enable_cli ? enable:bool
- start_cli
- stop_cli
+ enable_cli ? enable:bool;
+ start_cli;
+ stop_cli;
/**
* Enable/disable/start/stop BSR.
@@ -54,14 +54,14 @@
* @param enable if true, then enable the BSR, otherwise
* disable it.
*/
- enable_bsr ? enable:bool
- start_bsr
- stop_bsr
+ enable_bsr ? enable:bool;
+ start_bsr;
+ stop_bsr;
/**
* Apply BSR configuration changes.
*/
- apply_bsr_changes
+ apply_bsr_changes;
/**
* Add/delete scope zone.
@@ -73,21 +73,21 @@
* scope zone.
*/
add_config_scope_zone_by_vif_name4? scope_zone_id:ipv4net \
- & vif_name:txt
+ & vif_name:txt;
add_config_scope_zone_by_vif_name6? scope_zone_id:ipv6net \
- & vif_name:txt
+ & vif_name:txt;
add_config_scope_zone_by_vif_addr4? scope_zone_id:ipv4net \
- & vif_addr:ipv4
+ & vif_addr:ipv4;
add_config_scope_zone_by_vif_addr6? scope_zone_id:ipv6net \
- & vif_addr:ipv6
+ & vif_addr:ipv6;
delete_config_scope_zone_by_vif_name4? scope_zone_id:ipv4net \
- & vif_name:txt
+ & vif_name:txt;
delete_config_scope_zone_by_vif_name6? scope_zone_id:ipv6net \
- & vif_name:txt
+ & vif_name:txt;
delete_config_scope_zone_by_vif_addr4? scope_zone_id:ipv4net \
- & vif_addr:ipv4
+ & vif_addr:ipv4;
delete_config_scope_zone_by_vif_addr6? scope_zone_id:ipv6net \
- & vif_addr:ipv6
+ & vif_addr:ipv6;
/**
* Add/delete candidate-BSR configuration.
@@ -106,17 +106,17 @@
& vif_name:txt \
& vif_addr:ipv4 \
& bsr_priority:u32 \
- & hash_mask_len:u32
+ & hash_mask_len:u32;
add_config_cand_bsr6? scope_zone_id:ipv6net \
& is_scope_zone:bool \
& vif_name:txt \
& vif_addr:ipv6 \
& bsr_priority:u32 \
- & hash_mask_len:u32
+ & hash_mask_len:u32;
delete_config_cand_bsr4 ? scope_zone_id:ipv4net \
- & is_scope_zone:bool
+ & is_scope_zone:bool;
delete_config_cand_bsr6 ? scope_zone_id:ipv6net \
- & is_scope_zone:bool
+ & is_scope_zone:bool;
/**
* Add/delete Candidate-RP configuration.
@@ -135,21 +135,21 @@
& vif_name:txt \
& vif_addr:ipv4 \
& rp_priority:u32 \
- & rp_holdtime:u32
+ & rp_holdtime:u32;
add_config_cand_rp6 ? group_prefix:ipv6net \
& is_scope_zone:bool \
& vif_name:txt \
& vif_addr:ipv6 \
& rp_priority:u32 \
- & rp_holdtime:u32
+ & rp_holdtime:u32;
delete_config_cand_rp4? group_prefix:ipv4net \
& is_scope_zone:bool \
& vif_name:txt \
- & vif_addr:ipv4
+ & vif_addr:ipv4;
delete_config_cand_rp6? group_prefix:ipv6net \
& is_scope_zone:bool \
& vif_name:txt \
- & vif_addr:ipv6
+ & vif_addr:ipv6;
/**
* Add/delete/complete static RP configuration.
@@ -164,19 +164,19 @@
add_config_static_rp4 ? group_prefix:ipv4net \
& rp_addr:ipv4 \
& rp_priority:u32 \
- & hash_mask_len:u32
+ & hash_mask_len:u32;
add_config_static_rp6 ? group_prefix:ipv6net \
& rp_addr:ipv6 \
& rp_priority:u32 \
- & hash_mask_len:u32
+ & hash_mask_len:u32;
delete_config_static_rp4 ? group_prefix:ipv4net \
- & rp_addr:ipv4
+ & rp_addr:ipv4;
delete_config_static_rp6 ? group_prefix:ipv6net \
- & rp_addr:ipv6
- delete_config_all_static_group_prefixes_rp4 ? rp_addr:ipv4
- delete_config_all_static_group_prefixes_rp6 ? rp_addr:ipv6
- delete_config_all_static_rps
- config_static_rp_done
+ & rp_addr:ipv6;
+ delete_config_all_static_group_prefixes_rp4 ? rp_addr:ipv4;
+ delete_config_all_static_group_prefixes_rp6 ? rp_addr:ipv6;
+ delete_config_all_static_rps;
+ config_static_rp_done;
/**
* Get the configured protocol version per interface.
@@ -184,7 +184,7 @@
* @param vif_name the name of the vif to apply to.
* @param proto_version the protocol version.
*/
- get_vif_proto_version ? vif_name:txt -> proto_version:u32
+ get_vif_proto_version ? vif_name:txt -> proto_version:u32;
/**
* Set the protocol version per interface.
@@ -192,14 +192,14 @@
* @param vif_name the name of the vif to apply to.
* @param proto_version the protocol version.
*/
- set_vif_proto_version ? vif_name:txt & proto_version:u32
+ set_vif_proto_version ? vif_name:txt & proto_version:u32;
/**
* Reset the protocol version per interface to its default value.
*
* @param vif_name the name of the vif to apply to.
*/
- reset_vif_proto_version ? vif_name:txt
+ reset_vif_proto_version ? vif_name:txt;
/**
* Configure PIM Hello-related metrics.
@@ -224,34 +224,34 @@
* @param accept_nohello_neighbors if true, accept neighbors that
* didn't send a Hello message first.
*/
- get_vif_hello_triggered_delay ? vif_name:txt -> hello_triggered_delay:u32
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Xorp-cvs
mailing list