Use accessor functions for TRP objects.

diff --git a/common/tr_msg.c b/common/tr_msg.c
index 0d55ebe..11c3bff 100644 (file)
--- a/common/tr_msg.c
+++ b/common/tr_msg.c
@@ -535,17 +535,16 @@ static TID_RESP *tr_msg_decode_tidresp(json_t *jresp)
 
 /* Information records for TRP update msg 
  * requires that jrec already be allocated */
-static TRP_RC tr_msg_encode_inforec_route(json_t *jrec, TRP_INFOREC_DATA rec_data)
+static TRP_RC tr_msg_encode_inforec_route(json_t *jrec, TRP_INFOREC *rec )
 {
-  TRP_INFOREC_ROUTE *route=rec_data.route;
   json_t *jstr=NULL;
   json_t *jint=NULL;
   char *s=NULL;
 
-  if (route==NULL)
+  if (rec==NULL)
     return TRP_BADTYPE;
 
-  s=tr_name_strdup(route->comm);
+  s=tr_name_strdup(trp_inforec_get_comm(rec));
   if (s==NULL)
     return TRP_NOMEM;
   jstr=json_string(s);
@@ -554,7 +553,7 @@ static TRP_RC tr_msg_encode_inforec_route(json_t *jrec, TRP_INFOREC_DATA rec_dat
     return TRP_ERROR;
   json_object_set_new(jrec, "community", jstr);
 
-  s=tr_name_strdup(route->realm);
+  s=tr_name_strdup(trp_inforec_get_realm(rec));
   if (s==NULL)
     return TRP_NOMEM;
   jstr=json_string(s);
@@ -563,7 +562,7 @@ static TRP_RC tr_msg_encode_inforec_route(json_t *jrec, TRP_INFOREC_DATA rec_dat
     return TRP_ERROR;
   json_object_set_new(jrec, "realm", jstr);
 
-  s=tr_name_strdup(route->trust_router);
+  s=tr_name_strdup(trp_inforec_get_trust_router(rec));
   if (s==NULL)
     return TRP_NOMEM;
   jstr=json_string(s);
@@ -572,12 +571,12 @@ static TRP_RC tr_msg_encode_inforec_route(json_t *jrec, TRP_INFOREC_DATA rec_dat
     return TRP_ERROR;
   json_object_set_new(jrec, "trust_router", jstr);
 
-  jint=json_integer(route->metric);
+  jint=json_integer(trp_inforec_get_metric(rec));
   if(jint==NULL)
     return TRP_ERROR;
   json_object_set_new(jrec, "metric", jint);
 
-  jint=json_integer(route->interval);
+  jint=json_integer(trp_inforec_get_interval(rec));
   if(jint==NULL)
     return TRP_ERROR;
   json_object_set_new(jrec, "interval", jint);
@@ -590,14 +589,14 @@ static json_t *tr_msg_encode_inforec(TRP_INFOREC *rec)
   json_t *jrec=NULL;
   json_t *jstr=NULL;
 
-  if ((rec==NULL) || (rec->type==TRP_INFOREC_TYPE_UNKNOWN))
+  if ((rec==NULL) || (trp_inforec_get_type(rec)==TRP_INFOREC_TYPE_UNKNOWN))
     return NULL;
 
   jrec=json_object();
   if (jrec==NULL)
     return NULL;
 
-  jstr=json_string(trp_inforec_type_to_string(rec->type));
+  jstr=json_string(trp_inforec_type_to_string(trp_inforec_get_type(rec)));
   if (jstr==NULL) {
     json_decref(jrec);
     return NULL;
@@ -606,7 +605,7 @@ static json_t *tr_msg_encode_inforec(TRP_INFOREC *rec)
 
   switch (rec->type) {
   case TRP_INFOREC_TYPE_ROUTE:
-    if (TRP_SUCCESS!=tr_msg_encode_inforec_route(jrec, rec->data)) {
+    if (TRP_SUCCESS!=tr_msg_encode_inforec_route(jrec, rec)) {
       json_decref(jrec);
       return NULL;
     }
@@ -641,7 +640,7 @@ static TRP_INFOREC *tr_msg_decode_trp_inforec(TALLOC_CTX *mem_ctx, json_t *jreco
   }
 
   /* We only support route_info records for now*/
-  if (rec->type!=TRP_INFOREC_TYPE_ROUTE) {
+  if (trp_inforec_get_type(rec)!=TRP_INFOREC_TYPE_ROUTE) {
     rc=TRP_UNSUPPORTED;
     goto cleanup;
   }
@@ -658,14 +657,14 @@ static TRP_INFOREC *tr_msg_decode_trp_inforec(TALLOC_CTX *mem_ctx, json_t *jreco
   rc=tr_msg_get_json_string(jrecord, "realm", &s, tmp_ctx);
   if (rc != TRP_SUCCESS)
     goto cleanup;
-  if (TRP_SUCCESS!=trp_inforec_set_realm(rec, tr_new_name(s))) /* assumes route_info */
+  if (TRP_SUCCESS!=trp_inforec_set_realm(rec, tr_new_name(s)))
     goto cleanup;
   talloc_free(s); s=NULL;
 
   rc=tr_msg_get_json_string(jrecord, "trust_router", &s, tmp_ctx);
   if (rc != TRP_SUCCESS)
     goto cleanup;
-  if (TRP_SUCCESS!=trp_inforec_set_trust_router(rec, tr_new_name(s))) /* assumes route_info */
+  if (TRP_SUCCESS!=trp_inforec_set_trust_router(rec, tr_new_name(s)))
     goto cleanup;
   talloc_free(s); s=NULL;
 
@@ -710,7 +709,7 @@ static json_t *tr_msg_encode_trp_upd(TRP_UPD *update)
     return NULL;
   }
   json_object_set_new(jupdate, "records", jrecords); /* jrecords now a "borrowed" reference */
-  for (rec=update->records; rec!=NULL; rec=rec->next) {
+  for (rec=trp_upd_get_inforec(update); rec!=NULL; rec=trp_inforec_get_next(rec)) {
     jrec=tr_msg_encode_inforec(rec);
     if (jrec==NULL) {
       json_decref(jupdate); /* also decs jrecords and any elements */
@@ -761,9 +760,9 @@ static TRP_UPD *tr_msg_decode_trp_upd(TALLOC_CTX *mem_ctx, json_t *jupdate)
     }
 
     if (list_tail==NULL)
-      update->records=new_rec; /* first is a special case */
+      trp_upd_set_inforec(update, new_rec); /* first is a special case */
     else
-      list_tail->next=new_rec;
+      trp_inforec_set_next(list_tail, new_rec);
 
     list_tail=new_rec;
   }
@@ -792,7 +791,7 @@ static json_t *tr_msg_encode_trp_req(TRP_REQ *req)
   if (jbody==NULL)
     return NULL;
 
-  s=tr_name_strdup(req->comm); /* ensures null termination */
+  s=tr_name_strdup(trp_req_get_comm(req)); /* ensures null termination */
   if (s==NULL) {
     json_decref(jbody);
     return NULL;
@@ -805,7 +804,7 @@ static json_t *tr_msg_encode_trp_req(TRP_REQ *req)
   }
   json_object_set_new(jbody, "community", jstr);
     
-  s=tr_name_strdup(req->realm); /* ensures null termination */
+  s=tr_name_strdup(trp_req_get_realm(req)); /* ensures null termination */
   if (s==NULL) {
     json_decref(jbody);
     return NULL;
@@ -838,13 +837,13 @@ static TRP_REQ *tr_msg_decode_trp_req(TALLOC_CTX *mem_ctx, json_t *jreq)
   rc=tr_msg_get_json_string(jreq, "community", &s, tmp_ctx);
   if (rc!=TRP_SUCCESS)
     goto cleanup;
-  req->comm=tr_new_name(s);
+  trp_req_set_comm(req, tr_new_name(s));
   talloc_free(s); s=NULL;
 
   rc=tr_msg_get_json_string(jreq, "realm", &s, tmp_ctx);
   if (rc!=TRP_SUCCESS)
     goto cleanup;
-  req->realm=tr_new_name(s);
+  trp_req_set_realm(req, tr_new_name(s));
   talloc_free(s); s=NULL;
 
   rc=TRP_SUCCESS;

diff --git a/include/trp_internal.h b/include/trp_internal.h
index dab0140..d951012 100644 (file)
--- a/include/trp_internal.h
+++ b/include/trp_internal.h
@@ -46,15 +46,16 @@ struct trp_req {
   TR_NAME *realm;
 };
 
-TRP_INFOREC_TYPE trp_inforec_type_from_string(const char *s);
-const char *trp_inforec_type_to_string(TRP_INFOREC_TYPE msgtype);
-
 TRP_UPD *trp_upd_new(TALLOC_CTX *mem_ctx);
 void trp_upd_free(TRP_UPD *update);
-TRP_REQ *trp_req_new(TALLOC_CTX *mem_ctx);
-void trp_req_free(TRP_REQ *req);
+TRP_INFOREC *trp_upd_get_inforec(TRP_UPD *upd);
+void trp_upd_set_inforec(TRP_UPD *upd, TRP_INFOREC *rec);
 TRP_INFOREC *trp_inforec_new(TALLOC_CTX *mem_ctx, TRP_INFOREC_TYPE type);
 void trp_inforec_free(TRP_INFOREC *rec);
+TRP_INFOREC *trp_inforec_get_next(TRP_INFOREC *rec);
+void trp_inforec_set_next(TRP_INFOREC *rec, TRP_INFOREC *next_rec);
+TRP_INFOREC_TYPE trp_inforec_get_type(TRP_INFOREC *rec);
+void trp_inforec_set_type(TRP_INFOREC *rec, TRP_INFOREC_TYPE type);
 TR_NAME *trp_inforec_get_comm(TRP_INFOREC *rec);
 TRP_RC trp_inforec_set_comm(TRP_INFOREC *rec, TR_NAME *comm);
 TR_NAME *trp_inforec_get_realm(TRP_INFOREC *rec);
@@ -65,7 +66,16 @@ unsigned int trp_inforec_get_metric(TRP_INFOREC *rec);
 TRP_RC trp_inforec_set_metric(TRP_INFOREC *rec, unsigned int metric);
 unsigned int trp_inforec_get_interval(TRP_INFOREC *rec);
 TRP_RC trp_inforec_set_interval(TRP_INFOREC *rec, unsigned int interval);
+TRP_INFOREC_TYPE trp_inforec_type_from_string(const char *s);
+const char *trp_inforec_type_to_string(TRP_INFOREC_TYPE msgtype);
+
 
+TRP_REQ *trp_req_new(TALLOC_CTX *mem_ctx);
+void trp_req_free(TRP_REQ *req);
+TR_NAME *trp_req_get_comm(TRP_REQ *req);
+void trp_req_set_comm(TRP_REQ *req, TR_NAME *comm);
+TR_NAME *trp_req_get_realm(TRP_REQ *req);
+void trp_req_set_realm(TRP_REQ *req, TR_NAME *realm);
 
 typedef struct trps_instance TRPS_INSTANCE;
 

diff --git a/trp/trp_req.c b/trp/trp_req.c
index 0545fc4..d740266 100644 (file)
--- a/trp/trp_req.c
+++ b/trp/trp_req.c
@@ -5,342 +5,68 @@
 #include <trp_internal.h>
 #include <tr_debug.h>
 
-
-/* static prototypes */
-static void *trp_inforec_route_new(TALLOC_CTX *mem_ctx);
-static void trp_inforec_route_print(TRP_INFOREC_DATA);
-
-
-struct trp_inforec_type_entry {
-  const char *name;
-  TRP_INFOREC_TYPE type;
-  void *(*allocate)(TALLOC_CTX *);
-  void (*print)(TRP_INFOREC_DATA);
-};
-static struct trp_inforec_type_entry trp_inforec_type_table[] = {
-  { "route", TRP_INFOREC_TYPE_ROUTE, trp_inforec_route_new, trp_inforec_route_print },
-  { "comm", TRP_INFOREC_TYPE_COMMUNITY, NULL, NULL },
-  { NULL, TRP_INFOREC_TYPE_UNKNOWN, NULL, NULL } /* must be the last entry */
-};
-
-
-/* look up an entry in the trp_inforec_type_table */
-static struct trp_inforec_type_entry *get_trp_inforec_type_entry(TRP_INFOREC_TYPE msgtype)
-{
-  struct trp_inforec_type_entry *entry=trp_inforec_type_table;
-
-  while ((entry->type != TRP_INFOREC_TYPE_UNKNOWN)
-        && (entry->type != msgtype)) {
-    entry ++;
-  }
-  return entry;
-}
-
-/* translate strings to codes */
-TRP_INFOREC_TYPE trp_inforec_type_from_string(const char *s)
-{
-  struct trp_inforec_type_entry *entry=trp_inforec_type_table;
-
-  while ((entry->type != TRP_INFOREC_TYPE_UNKNOWN)
-        && (strcmp(s, entry->name)!=0)) {
-    entry++;
-  }
-  return entry->type;
-}
-/* translate codes to strings (do not need to be freed) 
- * Returns NULL on an unknown code */
-const char *trp_inforec_type_to_string(TRP_INFOREC_TYPE msgtype)
-{
-  struct trp_inforec_type_entry *entry=get_trp_inforec_type_entry(msgtype);
-  return entry->name;
-}
-
-
-/* called by talloc when destroying an update message body */
-static int trp_inforec_route_destructor(void *object)
+static int trp_req_destructor(void *object)
 {
-  TRP_INFOREC_ROUTE *body=talloc_get_type_abort(object, TRP_INFOREC_ROUTE);
+  TRP_REQ *req=talloc_get_type_abort(object, TRP_REQ);
   
   /* clean up TR_NAME data, which are not managed by talloc */
-  if (body->comm != NULL) {
-    tr_free_name(body->comm);
-    body->comm=NULL;
-    tr_debug("trp_inforec_route_destructor: freed community");
-  }
-  if (body->realm != NULL) {
-    tr_free_name(body->realm);
-    body->realm=NULL;
-    tr_debug("trp_inforec_route_destructor: freed realm");
+  if (req->comm != NULL) {
+    tr_free_name(req->comm);
+    req->comm=NULL;
+    tr_debug("trp_req_destructor: freed community");
   }
-  if (body->trust_router != NULL) {
-    tr_free_name(body->trust_router);
-    body->trust_router=NULL;
-    tr_debug("trp_inforec_route_destructor: freed trust_router");
+  if (req->realm != NULL) {
+    tr_free_name(req->realm);
+    req->realm=NULL;
+    tr_debug("trp_req_destructor: freed realm");
   }
-
   return 0;
 }
 
-static void *trp_inforec_route_new(TALLOC_CTX *mem_ctx)
-{
-  TRP_INFOREC_ROUTE *new_rec=talloc(mem_ctx, TRP_INFOREC_ROUTE);
-
-  if (new_rec != NULL) {
-    new_rec->comm=NULL;
-    new_rec->realm=NULL;
-    new_rec->trust_router=NULL;
-    new_rec->metric=TRP_METRIC_INFINITY;
-    new_rec->interval=0;
-    talloc_set_destructor((void *)new_rec, trp_inforec_route_destructor);
-  }
-  return new_rec;
-}
-
-TR_NAME *trp_inforec_get_comm(TRP_INFOREC *rec)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL)
-      return rec->data.route->comm;
-    break;
-  default:
-    break;
-  }
-  return NULL;
-}
-
-TRP_RC trp_inforec_set_comm(TRP_INFOREC *rec, TR_NAME *comm)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL) {
-      rec->data.route->comm=comm;
-      return TRP_SUCCESS;
-    }
-    break;
-  default:
-    break;
-  }
-  return TRP_ERROR;
-}
-
-TR_NAME *trp_inforec_get_realm(TRP_INFOREC *rec)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL)
-      return rec->data.route->realm;
-    break;
-  default:
-    break;
-  }
-  return NULL;
-}
-
-TRP_RC trp_inforec_set_realm(TRP_INFOREC *rec, TR_NAME *realm)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL) {
-      rec->data.route->realm=realm;
-      return TRP_SUCCESS;
-    } 
-    break;
-  default:
-    break;
-  }
-  return TRP_ERROR;
-}
-
-TR_NAME *trp_inforec_get_trust_router(TRP_INFOREC *rec)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL)
-      return rec->data.route->trust_router;
-    break;
-  default:
-    break;
-  }
-  return NULL;
-}
-
-TRP_RC trp_inforec_set_trust_router(TRP_INFOREC *rec, TR_NAME *trust_router)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL) {
-      rec->data.route->trust_router=trust_router;
-      return TRP_SUCCESS;
-    }
-    break;
-  default:
-    break;
-  }
-  return TRP_ERROR;
-}
-
-unsigned int trp_inforec_get_metric(TRP_INFOREC *rec)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL)
-      return rec->data.route->metric;
-    break;
-  default:
-    break;
-  }
-  return TRP_METRIC_INVALID;
-}
-
-TRP_RC trp_inforec_set_metric(TRP_INFOREC *rec, unsigned int metric)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL) {
-      rec->data.route->metric=metric;
-      return TRP_SUCCESS;
-    }
-    break;
-  default:
-    break;
-  }
-  return TRP_ERROR;
-}
-
-unsigned int trp_inforec_get_interval(TRP_INFOREC *rec)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL)
-      return rec->data.route->interval;
-    break;
-  default:
-    break;
-  }
-  return TRP_INTERVAL_INVALID;
-}
-
-TRP_RC trp_inforec_set_interval(TRP_INFOREC *rec, unsigned int interval)
-{
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    if (rec->data.route!=NULL) {
-      rec->data.route->interval=interval;
-      return TRP_SUCCESS;
-  default:
-    break;
-    }
-    break;
-  }
-  return TRP_ERROR;
-}
-
-/* for internal use only; must set rec->type before calling this */
-static TRP_RC trp_inforec_set_data(TRP_INFOREC *rec, void *data)
-{
-  if (data==NULL)
-    return TRP_ERROR;
-
-  switch (rec->type) {
-  case TRP_INFOREC_TYPE_ROUTE:
-    rec->data.route=talloc_get_type(data, TRP_INFOREC_ROUTE);
-    break;
-  default:
-    return TRP_BADTYPE;
-  }
-  return TRP_SUCCESS;
-}
-
-/* generic record type */
-TRP_INFOREC *trp_inforec_new(TALLOC_CTX *mem_ctx, TRP_INFOREC_TYPE type)
+TRP_REQ *trp_req_new(TALLOC_CTX *mem_ctx)
 {
-  TRP_INFOREC *new_rec=talloc(mem_ctx, TRP_INFOREC);
-  struct trp_inforec_type_entry *dtype=get_trp_inforec_type_entry(type);
+  TRP_REQ *new_req=talloc(mem_ctx, TRP_REQ);
 
-  if ((new_rec != NULL) && (dtype->type != TRP_INFOREC_TYPE_UNKNOWN)) {
-    new_rec->next=NULL;
-    new_rec->type=type;
-    if (dtype->allocate!=NULL) {
-      if (TRP_SUCCESS!=trp_inforec_set_data(new_rec, dtype->allocate(new_rec))) {
-        talloc_free(new_rec);
-        new_rec=NULL;
-      }
-    }
+  if (new_req != NULL) {
+    new_req->comm=NULL;
+    new_req->realm=NULL;
   }
-  return new_rec;
-}
 
-void trp_inforec_free(TRP_INFOREC *rec)
-{
-  if (rec!=NULL)
-    talloc_free(rec);
+  talloc_set_destructor((void *)new_req, trp_req_destructor);
+  return new_req;
 }
 
-TRP_UPD *trp_upd_new(TALLOC_CTX *mem_ctx)
+void trp_req_free(TRP_REQ *req)
 {
-  TRP_UPD *new_body=talloc(mem_ctx, TRP_UPD);
-
-  if (new_body!=NULL) {
-    new_body->records=NULL;
-  }
-  return new_body;
+  if (req!=NULL)
+    talloc_free(req);
 }
 
-void trp_upd_free(TRP_UPD *update)
+TR_NAME *trp_req_get_comm(TRP_REQ *req)
 {
-  if (update!=NULL)
-    talloc_free(update);
+  if (req!=NULL)
+    return req->comm;
+  else
+    return NULL;
 }
 
-
-/* pretty print */
-static void trp_inforec_route_print(TRP_INFOREC_DATA data)
+void trp_req_set_comm(TRP_REQ *req, TR_NAME *comm)
 {
-  if (data.route!=NULL) {
-    printf("     community=%.*s\n     realm=%.*s\n     trust_router=%.*s\n     metric=%d\n     interval=%d]\n",
-           data.route->comm->len, data.route->comm->buf,
-           data.route->realm->len, data.route->realm->buf,
-           data.route->trust_router->len, data.route->trust_router->buf,
-           data.route->metric, data.route->interval);
-  }
+  if (req)
+    req->comm=comm;
 }
 
-
-static int trp_req_destructor(void *object)
+TR_NAME *trp_req_get_realm(TRP_REQ *req)
 {
-  TRP_REQ *body=talloc_get_type_abort(object, TRP_REQ);
-  
-  /* clean up TR_NAME data, which are not managed by talloc */
-  if (body->comm != NULL) {
-    tr_free_name(body->comm);
-    body->comm=NULL;
-    tr_debug("trp_req_destructor: freed community");
-  }
-  if (body->realm != NULL) {
-    tr_free_name(body->realm);
-    body->realm=NULL;
-    tr_debug("trp_req_destructor: freed realm");
-  }
-  return 0;
+  if (req!=NULL)
+    return req->realm;
+  else
+    return NULL;
 }
 
-TRP_REQ *trp_req_new(TALLOC_CTX *mem_ctx)
-{
-  TRP_REQ *new_body=talloc(mem_ctx, TRP_REQ);
-
-  if (new_body != NULL) {
-    new_body->comm=NULL;
-    new_body->realm=NULL;
-  }
 
-  talloc_set_destructor((void *)new_body, trp_req_destructor);
-  return new_body;
-}
-
-void trp_req_free(TRP_REQ *req)
+void trp_req_set_realm(TRP_REQ *req, TR_NAME *realm)
 {
-  if (req!=NULL)
-    talloc_free(req);
+  if (req)
+    req->realm=realm;
 }
-

diff --git a/trp/trp_upd.c b/trp/trp_upd.c
index 7c6a1e7..248f458 100644 (file)
--- a/trp/trp_upd.c
+++ b/trp/trp_upd.c
@@ -95,6 +95,34 @@ static void *trp_inforec_route_new(TALLOC_CTX *mem_ctx)
   return new_rec;
 }
 
+TRP_INFOREC *trp_inforec_get_next(TRP_INFOREC *rec)
+{
+  if (rec!=NULL)
+    return rec->next;
+  else
+    return NULL;
+}
+
+void trp_inforec_set_next(TRP_INFOREC *rec, TRP_INFOREC *next_rec)
+{
+  if (rec !=NULL)
+    rec->next=next_rec;
+}
+
+TRP_INFOREC_TYPE trp_inforec_get_type(TRP_INFOREC *rec)
+{
+  if (rec)
+    return rec->type;
+  else
+    return TRP_INFOREC_TYPE_UNKNOWN;
+}
+
+void trp_inforec_set_type(TRP_INFOREC *rec, TRP_INFOREC_TYPE type)
+{
+  if (rec!=NULL)
+    rec->type=type;
+}
+
 TR_NAME *trp_inforec_get_comm(TRP_INFOREC *rec)
 {
   switch (rec->type) {
@@ -258,8 +286,8 @@ TRP_INFOREC *trp_inforec_new(TALLOC_CTX *mem_ctx, TRP_INFOREC_TYPE type)
   struct trp_inforec_type_entry *dtype=get_trp_inforec_type_entry(type);
 
   if ((new_rec != NULL) && (dtype->type != TRP_INFOREC_TYPE_UNKNOWN)) {
-    new_rec->next=NULL;
-    new_rec->type=type;
+    trp_inforec_set_type(new_rec, type);
+    trp_inforec_set_next(new_rec, NULL);
     if (dtype->allocate!=NULL) {
       if (TRP_SUCCESS!=trp_inforec_set_data(new_rec, dtype->allocate(new_rec))) {
         talloc_free(new_rec);
@@ -292,6 +320,19 @@ void trp_upd_free(TRP_UPD *update)
     talloc_free(update);
 }
 
+TRP_INFOREC *trp_upd_get_inforec(TRP_UPD *upd)
+{
+  if (upd!=NULL)
+    return upd->records;
+  else
+    return NULL;
+}
+
+void trp_upd_set_inforec(TRP_UPD *upd, TRP_INFOREC *rec)
+{
+  if (upd!=NULL)
+    upd->records=rec;
+}
 
 /* pretty print */
 static void trp_inforec_route_print(TRP_INFOREC_DATA data)