Real syslog support for trust router

[trust_router.git] / common / tr_msg.c

diff --git a/common/tr_msg.c b/common/tr_msg.c
index 85be430..5754f0c 100644 (file)
--- a/common/tr_msg.c
+++ b/common/tr_msg.c
@@ -113,7 +113,7 @@ static DH *tr_msg_decode_dh(json_t *jdh)
   json_t *jpub_key = NULL;
 
   if (!(dh = malloc(sizeof(DH)))) {
-    fprintf (stderr, "tr_msg_decode_dh(): Error allocating DH structure.\n");
+    tr_crit("tr_msg_decode_dh(): Error allocating DH structure.");
     return NULL;
   }
  
@@ -123,7 +123,7 @@ static DH *tr_msg_decode_dh(json_t *jdh)
   if ((NULL == (jp = json_object_get(jdh, "dh_p"))) ||
       (NULL == (jg = json_object_get(jdh, "dh_g"))) ||
       (NULL == (jpub_key = json_object_get(jdh, "dh_pub_key")))) {
-    fprintf (stderr, "tr_msg_decode_dh(): Error parsing dh_info.\n");
+    tr_debug("tr_msg_decode_dh(): Error parsing dh_info.");
     free(dh);
     return NULL;
   }
@@ -177,7 +177,7 @@ static TID_REQ *tr_msg_decode_tidreq(json_t *jreq)
   json_t *jdh = NULL;
 
   if (!(treq =tid_req_new())) {
-    fprintf (stderr, "tr_msg_decode_tidreq(): Error allocating TID_REQ structure.\n");
+    tr_crit("tr_msg_decode_tidreq(): Error allocating TID_REQ structure.");
     return NULL;
   }
  
@@ -185,7 +185,7 @@ static TID_REQ *tr_msg_decode_tidreq(json_t *jreq)
   if ((NULL == (jrp_realm = json_object_get(jreq, "rp_realm"))) ||
       (NULL == (jrealm = json_object_get(jreq, "target_realm"))) ||
       (NULL == (jcomm = json_object_get(jreq, "community")))) {
-    fprintf (stderr, "tr_msg_decode(): Error parsing required fields.\n");
+    tr_debug("tr_msg_decode(): Error parsing required fields.");
     tid_req_free(treq);
     return NULL;
   }
@@ -196,7 +196,7 @@ static TID_REQ *tr_msg_decode_tidreq(json_t *jreq)
 
   /* Get DH Info from the request */
   if (NULL == (jdh = json_object_get(jreq, "dh_info"))) {
-    fprintf (stderr, "tr_msg_decode(): Error parsing dh_info.\n");
+    tr_debug("tr_msg_decode(): Error parsing dh_info.");
     tid_req_free(treq);
     return NULL;
   }
@@ -210,7 +210,7 @@ static TID_REQ *tr_msg_decode_tidreq(json_t *jreq)
   treq->cons = (TR_CONSTRAINT_SET *) json_object_get(jreq, "constraints");
   if (treq->cons) {
     if (!tr_constraint_set_validate(treq->cons)) {
-      tr_debug("Constraint set validation failed\n");
+      tr_debug("Constraint set validation failed");
     tid_req_free(treq);
     return NULL;
     }
@@ -226,7 +226,7 @@ static json_t *tr_msg_encode_one_server(TID_SRVR_BLK *srvr)
   json_t *jstr = NULL;
   gchar *time_str = g_time_val_to_iso8601(&srvr->key_expiration);
 
-  fprintf(stderr, "Encoding one server.\n");
+  tr_debug("Encoding one server.");
 
   jsrvr = json_object();
 
@@ -244,8 +244,6 @@ static json_t *tr_msg_encode_one_server(TID_SRVR_BLK *srvr)
   if (srvr->path)
     /* The path is owned by the srvr, so grab an extra ref*/
     json_object_set(jsrvr, "path", srvr->path);
-  //  fprintf(stderr,"tr_msg_encode_one_server(): jsrvr contains:\n");
-  //  fprintf(stderr,"%s\n", json_dumps(jsrvr, 0));
   return jsrvr;
 }
 
@@ -262,7 +260,7 @@ static int tr_msg_decode_one_server(json_t *jsrvr, TID_SRVR_BLK *srvr)
   if ((NULL == (jsrvr_addr = json_object_get(jsrvr, "server_addr"))) ||
       (NULL == (jsrvr_kn = json_object_get(jsrvr, "key_name"))) ||
       (NULL == (jsrvr_dh = json_object_get(jsrvr, "server_dh")))) {
-    tr_debug("tr_msg_decode_one_server(): Error parsing required fields.\n");
+    tr_debug("tr_msg_decode_one_server(): Error parsing required fields.");
     return -1;
   }
   
@@ -289,8 +287,8 @@ static json_t *tr_msg_encode_servers(TID_RESP *resp)
     }
   }
 
-  //  fprintf(stderr,"tr_msg_encode_servers(): servers contains:\n");
-  //  fprintf(stderr,"%s\n", json_dumps(jservers, 0));
+  //  tr_debug("tr_msg_encode_servers(): servers contains:");
+  //  tr_debug("%s", json_dumps(jservers, 0));
   return jservers;
 }
 
@@ -301,13 +299,13 @@ static TID_SRVR_BLK *tr_msg_decode_servers(void * ctx, json_t *jservers, size_t
   size_t i, num_servers;
 
   num_servers = json_array_size(jservers);
-  fprintf(stderr, "tr_msg_decode_servers(): Number of servers = %u.\n", (unsigned) num_servers);
+  tr_debug("tr_msg_decode_servers(): Number of servers = %u.", (unsigned) num_servers);
   
   if (0 == num_servers) {
-    fprintf(stderr, "tr_msg_decode_servers(): Server array is empty.\n"); 
+    tr_debug("tr_msg_decode_servers(): Server array is empty."); 
     return NULL;
   }
-    servers = talloc_zero_array(ctx, TID_SRVR_BLK, num_servers);
+  servers = talloc_zero_array(ctx, TID_SRVR_BLK, num_servers);
 
   for (i = 0; i < num_servers; i++) {
     jsrvr = json_array_get(jservers, i);
@@ -361,7 +359,7 @@ static json_t * tr_msg_encode_tidresp(TID_RESP *resp)
   }
 
   if (NULL == resp->servers) {
-    fprintf(stderr, "tr_msg_encode_tidresp(): No servers to encode.\n");
+    tr_debug("tr_msg_encode_tidresp(): No servers to encode.");
     return jresp;
   }
   jservers = tr_msg_encode_servers(resp);
@@ -382,7 +380,7 @@ static TID_RESP *tr_msg_decode_tidresp(json_t *jresp)
   json_t *jerr_msg = NULL;
 
   if (!(tresp = talloc_zero(NULL, TID_RESP))) {
-    fprintf (stderr, "tr_msg_decode_tidresp(): Error allocating TID_RESP structure.\n");
+    tr_crit("tr_msg_decode_tidresp(): Error allocating TID_RESP structure.");
     return NULL;
   }
  
@@ -396,13 +394,13 @@ static TID_RESP *tr_msg_decode_tidresp(json_t *jresp)
       (!json_is_string(jrealm)) ||
       (NULL == (jcomm = json_object_get(jresp, "comm"))) ||
       (!json_is_string(jcomm))) {
-    fprintf (stderr, "tr_msg_decode_tidresp(): Error parsing response.\n");
+    tr_debug("tr_msg_decode_tidresp(): Error parsing response.");
     talloc_free(tresp);
     return NULL;
   }
 
   if (0 == (strcmp(json_string_value(jresult), "success"))) {
-    fprintf(stderr, "tr_msg_decode_tidresp(): Success! result = %s.\n", json_string_value(jresult));
+    tr_debug("tr_msg_decode_tidresp(): Success! result = %s.", json_string_value(jresult));
     if ((NULL != (jservers = json_object_get(jresp, "servers"))) ||
        (!json_is_array(jservers))) {
       tresp->servers = tr_msg_decode_servers(tresp, jservers, &tresp->num_servers); 
@@ -415,7 +413,7 @@ static TID_RESP *tr_msg_decode_tidresp(json_t *jresp)
   }
   else {
     tresp->result = TID_ERROR;
-    fprintf(stderr, "tr_msg_decode_tidresp(): Error! result = %s.\n", json_string_value(jresult));
+    tr_debug("tr_msg_decode_tidresp(): Error! result = %s.", json_string_value(jresult));
     if ((NULL != (jerr_msg = json_object_get(jresp, "err_msg"))) ||
        (!json_is_string(jerr_msg))) {
       tresp->err_msg = tr_new_name((char *)json_string_value(jerr_msg));
@@ -477,12 +475,12 @@ TR_MSG *tr_msg_decode(char *jbuf, size_t buflen)
   const char *mtype = NULL;
 
   if (NULL == (jmsg = json_loadb(jbuf, buflen, JSON_DISABLE_EOF_CHECK, &rc))) {
-    fprintf (stderr, "tr_msg_decode(): error loading object\n");
+    tr_debug("tr_msg_decode(): error loading object");
     return NULL;
   }
 
   if (!(msg = malloc(sizeof(TR_MSG)))) {
-    fprintf (stderr, "tr_msg_decode(): Error allocating TR_MSG structure.\n");
+    tr_debug("tr_msg_decode(): Error allocating TR_MSG structure.");
     json_decref(jmsg);
     return NULL;
   }
@@ -491,7 +489,7 @@ TR_MSG *tr_msg_decode(char *jbuf, size_t buflen)
 
   if ((NULL == (jtype = json_object_get(jmsg, "msg_type"))) ||
       (NULL == (jbody = json_object_get(jmsg, "msg_body")))) {
-    fprintf (stderr, "tr_msg_decode(): Error parsing message header.\n");
+    tr_debug("tr_msg_decode(): Error parsing message header.");
     json_decref(jmsg);
     tr_msg_free_decoded(msg);
     return NULL;