u8 *s;
s = format (0, "SCRIPT: lisp_enable_disable %s",
- mp->is_en ? "enable" : "disable");
+ mp->is_enable ? "enable" : "disable");
FINISH;
}
s = format (s, "%s ", mp->is_add ? "add" : "del");
s = format (s, "vni %d ", (mp->vni));
- s = format (s, "eid %U ", format_lisp_flat_eid,
- mp->eid_type, mp->eid, mp->eid_len);
+ s = format (s, "eid %U ", format_lisp_flat_eid, mp->deid);
if (mp->is_src_dst)
{
- 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->seid);
}
rloc_num = (mp->rloc_num);
s = format (s, "%s ", mp->is_add ? "add" : "del");
s = format (s, "vni %d ", (mp->vni));
s = format (s, "reid %U leid %U ",
- format_lisp_flat_eid, mp->eid_type, mp->reid, mp->reid_len,
- format_lisp_flat_eid, mp->eid_type, mp->leid, mp->leid_len);
+ format_lisp_flat_eid, mp->reid, format_lisp_flat_eid, mp->leid);
FINISH;
}
s = format (s, "del ");
s = format (s, "vni %d ", (mp->vni));
- s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type, mp->eid,
- mp->prefix_len);
+ s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid);
s = format (s, "locator-set %s ", mp->locator_set_name);
- if (*mp->key)
+ if (mp->key.id)
{
- u32 key_id = mp->key_id;
+ u32 key_id = mp->key.id;
s = format (s, "key-id %U", format_hmac_key_id, key_id);
- s = format (s, "secret-key %s", mp->key);
+ s = format (s, "secret-key %s", mp->key.key);
}
FINISH;
}
if (!mp->is_add)
s = format (s, "del ");
- if (mp->is_ipv6)
- s = format (s, "%U ", format_ip6_address, mp->ip_address);
+ if (mp->ip_address.af)
+ s = format (s, "%U ", format_ip6_address, mp->ip_address.un.ip6);
else
- s = format (s, "%U ", format_ip4_address, mp->ip_address);
+ s = format (s, "%U ", format_ip4_address, mp->ip_address.un.ip4);
FINISH;
}
s = format (0, "SCRIPT: gpe_enable_disable ");
- s = format (s, "%s ", mp->is_en ? "enable" : "disable");
+ s = format (s, "%s ", mp->is_enable ? "enable" : "disable");
FINISH;
}
s = format (0, "SCRIPT: lisp_map_request_mode ");
- switch (mp->mode)
- {
- case 0:
- s = format (s, "dst-only");
- break;
- case 1:
- s = format (s, "src-dst");
- default:
- break;
- }
+ s = mp->is_src_dst ? format (s, "src-dst") : format (s, "dst-only");
FINISH;
}
if (mp->eid_set)
{
s = format (s, "vni %d ", (mp->vni));
- s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type,
- mp->eid, mp->prefix_length);
+ s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid);
switch (mp->filter)
{
case 1:
case 2:
s = format (s, "remote ");
break;
+ default:
+ break;
}
}
FINISH;
u8 *s;
s = format (0, "SCRIPT: lisp_rloc_probe_enable_disable ");
- if (mp->is_enabled)
+ if (mp->is_enable)
s = format (s, "enable");
else
s = format (s, "disable");
u8 *s;
s = format (0, "SCRIPT: lisp_map_register_enable_disable ");
- if (mp->is_enabled)
+ if (mp->is_enable)
s = format (s, "enable");
else
s = format (s, "disable");