summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMinoru TAKAHASHI <takahashi.minoru7@gmail.com>2015-10-09 13:11:45 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-10-11 22:10:23 +0900
commit55ed988834858aa62b770d0a010c30388ebe4b9c (patch)
treeabcf41e9254f11e83c2496d9c2797608f6788f3b
parentb4c3ef03a414d840eac0174bb965b07c1356ce8c (diff)
packet_data_generator2: Fix to use struct eth_addr
In accordance with the upgrade of the ofputil in OVS libraries, this patch fixes to use struct eth_addr. FYI: The appropriate commit on OVS GitHub https://github.com/openvswitch/ovs/commit/74ff3298c8806bb09d0c7e40a25b889ab7564769 Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/packet_data_generator2/gen.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ryu/tests/packet_data_generator2/gen.c b/ryu/tests/packet_data_generator2/gen.c
index 4b9cc6f7..e68ffb73 100644
--- a/ryu/tests/packet_data_generator2/gen.c
+++ b/ryu/tests/packet_data_generator2/gen.c
@@ -73,10 +73,12 @@ dump_message(const char *name, struct ofpbuf *buf)
void
fill_match(struct match *match)
{
+ const struct eth_addr dl_dst =
+ { { { 0xaa, 0xbb, 0xcc, 0x99, 0x88, 0x77 } } };
match_init_catchall(match);
match_set_in_port(match, 0xabcd);
match_set_dl_vlan(match, htons(999));
- match_set_dl_dst(match, "\xaa\xbb\xcc\x99\x88\x77");
+ match_set_dl_dst(match, dl_dst);
match_set_dl_type(match, htons(ETH_TYPE_IP));
match_set_nw_dst(match, inet_addr("192.168.2.1"));
match_set_tun_src(match, inet_addr("192.168.2.3"));