#include <trp_rtable.h>
#include <trust_router/trp.h>
#include <tr_util.h>
+#include <tr_json_util.h>
+#include <tr_inet_util.h>
/* Pretty print a route table entry to a newly allocated string. If sep is NULL,
* returns comma+space separated string. */
sep=", ";
result=talloc_asprintf(mem_ctx,
- "%s%s%s%s%s%s%u%s%s%s%s%s%u%s%u%s%s%s%u",
+ "%s%s%s%s%s%s%u%s%s:%d%s%s:%d%s%u%s%u%s%s%s%u",
comm, sep,
realm, sep,
peer, sep,
entry->metric, sep,
- trust_router, sep,
- next_hop, sep,
+ trust_router, entry->trust_router_port, sep,
+ next_hop, entry->next_hop_port, sep,
entry->selected, sep,
entry->local, sep,
expiry, sep,
return result;
}
-/* helper for below */
-#define OBJECT_SET_OR_FAIL(jobj, key, val) \
-do { \
- if (val) \
- json_object_set_new((jobj),(key),(val)); \
- else \
- goto cleanup; \
-} while (0)
+/* helper */
+static json_t *expiry_to_json_string(TRP_ROUTE *route)
+{
+ struct timespec ts = {0}; /* initialization to zero is important */
+ char *s = NULL;
+ json_t *jstr = NULL;
+
+ if (tr_cmp_timespec(trp_route_get_expiry(route), &ts) > 0) {
+ if (trp_route_get_expiry_realtime(route, &ts) == NULL)
+ s = strdup("error");
+ else
+ s = timespec_to_str(&ts);
+
+ if (s) {
+ jstr = json_string(s);
+ free(s);
+ }
+ }
+
+ return jstr;
+}
json_t *trp_route_to_json(TRP_ROUTE *route)
{
json_t *route_json = NULL;
- char *expires = NULL;
- struct timespec ts_zero = {0, 0};
+ json_t *retval = NULL;
+ TR_NAME *n;
route_json = json_object();
if (route_json == NULL)
- return NULL;
-
- if (tr_cmp_timespec(trp_route_get_expiry(route), &ts_zero) == 0) {
- expires = strdup("");
- } else {
- expires = timespec_to_str(route->expiry);
- if (expires == NULL) {
- json_decref(route_json);
- return NULL;
- }
- }
+ goto cleanup;
+
+ OBJECT_SET_OR_FAIL(route_json, "community", tr_name_to_json_string(trp_route_get_comm(route)));
+ OBJECT_SET_OR_FAIL(route_json, "realm", tr_name_to_json_string(trp_route_get_realm(route)));
+ if (trp_route_get_peer(route)->len > 0)
+ OBJECT_SET_OR_FAIL(route_json, "peer", tr_name_to_json_string(trp_route_get_peer(route)));
+ OBJECT_SET_OR_FAIL(route_json, "metric", json_integer(trp_route_get_metric(route)));
+
+ /* add trust_router as hostname:port */
+ n = tr_hostname_and_port_to_name(
+ trp_route_get_trust_router(route),
+ trp_route_get_trust_router_port(route));
+ if (n == NULL)
+ goto cleanup;
+ OBJECT_SET_OR_FAIL(route_json, "trust_router", tr_name_to_json_string(n));
+ tr_free_name(n);
+
+ /* add next_hop as hostname:port */
+ n = tr_hostname_and_port_to_name(
+ trp_route_get_next_hop(route),
+ trp_route_get_next_hop_port(route));
+ if (n == NULL)
+ goto cleanup;
+ OBJECT_SET_OR_FAIL(route_json, "next_hop", tr_name_to_json_string(n));
+ tr_free_name(n);
+
+ OBJECT_SET_OR_FAIL(route_json, "selected", json_boolean(trp_route_is_selected(route)));
+ OBJECT_SET_OR_FAIL(route_json, "local", json_boolean(trp_route_is_local(route)));
+ OBJECT_SET_OR_SKIP(route_json, "expires", expiry_to_json_string(route));
+
+ /* succeeded - set the return value and increment the reference count */
+ retval = route_json;
+ json_incref(retval);
- OBJECT_SET_OR_FAIL(route_json, "community", tr_name_to_json_string(route->comm));
- OBJECT_SET_OR_FAIL(route_json, "realm", tr_name_to_json_string(route->realm));
- OBJECT_SET_OR_FAIL(route_json, "peer", tr_name_to_json_string(route->peer));
- OBJECT_SET_OR_FAIL(route_json, "metric", json_integer(route->metric));
- OBJECT_SET_OR_FAIL(route_json, "trust_router", tr_name_to_json_string(route->trust_router));
- OBJECT_SET_OR_FAIL(route_json, "next_hop", tr_name_to_json_string(route->next_hop));
- OBJECT_SET_OR_FAIL(route_json, "selected", json_boolean(route->selected));
- OBJECT_SET_OR_FAIL(route_json, "local", json_boolean(route->local));
- OBJECT_SET_OR_FAIL(route_json, "expires", json_string(expires));
cleanup:
- free(expires);
- return route_json;
+ if (route_json)
+ json_decref(route_json);
+ return retval;
}
\ No newline at end of file