Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tapv2: add option to set host-side default gw
[vpp.git]
/
src
/
vpp
/
api
/
custom_dump.c
diff --git
a/src/vpp/api/custom_dump.c
b/src/vpp/api/custom_dump.c
index
c26d65a
..
62f3c5f
100644
(file)
--- a/
src/vpp/api/custom_dump.c
+++ b/
src/vpp/api/custom_dump.c
@@
-1,20
+1,20
@@
/*
/*
- *------------------------------------------------------------------
+ *
------------------------------------------------------------------
* custom_dump.c - pretty-print API messages for replay
*
* custom_dump.c - pretty-print API messages for replay
*
- * Copyright (c) 2014-2016 Cisco and/or its affiliates.
- *
Licensed under the Apache License, Version 2.0 (the "License");
- *
you may not use this file except in compliance with the License.
- *
You may obtain a copy of the
License at:
+ * Copyright (c) 2014-2016 Cisco and/or its affiliates.
Licensed under the
+ *
Apache License, Version 2.0 (the "License"); you may not use this file
+ *
except in compliance with the License. You may obtain a copy of the
+ * License at:
*
*
- *
http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * W
ITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
See the License for the specific language governing permissions and
- *
limitations
under the License.
- *------------------------------------------------------------------
+ * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
+ * W
ARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *
License for the specific language governing permissions and limitations
+ * under the License.
+ *
------------------------------------------------------------------
*/
#include <vnet/vnet.h>
*/
#include <vnet/vnet.h>
@@
-25,6
+25,7
@@
#include <vnet/l2tp/l2tp.h>
#include <vnet/l2/l2_input.h>
#include <vnet/srv6/sr.h>
#include <vnet/l2tp/l2tp.h>
#include <vnet/l2/l2_input.h>
#include <vnet/srv6/sr.h>
+#include <vnet/srmpls/sr_mpls.h>
#include <vnet/vxlan-gpe/vxlan_gpe.h>
#include <vnet/geneve/geneve.h>
#include <vnet/classify/policer_classify.h>
#include <vnet/vxlan-gpe/vxlan_gpe.h>
#include <vnet/geneve/geneve.h>
#include <vnet/classify/policer_classify.h>
@@
-575,6
+576,10
@@
static void *vl_api_tap_create_v2_t_print
if (mp->host_ip6_addr_set)
s = format (s, "host-ip6-addr %U/%d ", format_ip6_address,
mp->host_ip6_addr, mp->host_ip6_prefix_len);
if (mp->host_ip6_addr_set)
s = format (s, "host-ip6-addr %U/%d ", format_ip6_address,
mp->host_ip6_addr, mp->host_ip6_prefix_len);
+ if (mp->host_ip4_gw_set)
+ s = format (s, "host-ip4-gw %U ", format_ip4_address, mp->host_ip4_addr);
+ if (mp->host_ip6_gw_set)
+ s = format (s, "host-ip6-gw %U ", format_ip6_address, mp->host_ip6_addr);
if (mp->tx_ring_sz)
s = format (s, "tx-ring-size %d ", mp->tx_ring_sz);
if (mp->rx_ring_sz)
if (mp->tx_ring_sz)
s = format (s, "tx-ring-size %d ", mp->tx_ring_sz);
if (mp->rx_ring_sz)
@@
-2064,7
+2069,6
@@
format_policer_action (u8 * s, va_list * va)
}
s = format (s, "%s", t);
}
}
s = format (s, "%s", t);
}
-
return s;
}
return s;
}
@@
-2610,7
+2614,6
@@
static void *vl_api_lisp_add_del_remote_mapping_t_print
s = format (s, "seid %U ", format_lisp_flat_eid,
mp->eid_type, mp->seid, mp->seid_len);
}
s = format (s, "seid %U ", format_lisp_flat_eid,
mp->eid_type, mp->seid, mp->seid_len);
}
-
rloc_num = clib_net_to_host_u32 (mp->rloc_num);
if (0 == rloc_num)
rloc_num = clib_net_to_host_u32 (mp->rloc_num);
if (0 == rloc_num)
@@
-2833,7
+2836,6
@@
static void *vl_api_lisp_eid_table_dump_t_print
break;
}
}
break;
}
}
-
FINISH;
}
FINISH;
}
@@
-2946,7
+2948,6
@@
static void *vl_api_l2_interface_pbb_tag_rewrite_t_print
s = format (s, "sid %d ", ntohl (mp->i_sid));
s = format (s, "vlanid %d ", ntohs (mp->b_vlanid));
}
s = format (s, "sid %d ", ntohl (mp->i_sid));
s = format (s, "vlanid %d ", ntohs (mp->b_vlanid));
}
-
FINISH;
}
FINISH;
}
@@
-3185,7
+3186,7
@@
static void *vl_api_sw_interface_set_lldp_t_print
(vl_api_sw_interface_set_lldp_t * mp, void *handle)
{
u8 *s;
(vl_api_sw_interface_set_lldp_t * mp, void *handle)
{
u8 *s;
- u8 null_data[
128
];
+ u8 null_data[
256
];
memset (null_data, 0, sizeof (null_data));
memset (null_data, 0, sizeof (null_data));
@@
-3503,7
+3504,5
@@
vl_msg_api_custom_dump_configure (api_main_t * am)
/*
* fd.io coding-style-patch-verification: ON
*
/*
* fd.io coding-style-patch-verification: ON
*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
+ * Local Variables: eval: (c-set-style "gnu") End:
*/
*/