X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=blobdiff_plain;f=tid%2Ftids.c;fp=tid%2Ftids.c;h=3775b52d68721535bc5fa2873fe78cba456fb450;hp=a984b8dcacbde80e5d14623dcd4d616c3f08adbf;hb=240db3f1e5143b5eae6d6d5b81bb83a128f8450c;hpb=722204aaf7faff43fc5f8b3e780fccf4078c0874

diff --git a/tid/tids.c b/tid/tids.c
index a984b8d..3775b52 100644
--- a/tid/tids.c
+++ b/tid/tids.c
@@ -262,18 +262,18 @@ int tids_send_response (TIDS_INSTANCE *tids, TID_REQ *req, TID_RESP *resp)
  * @param data pointer to a TIDS_INSTANCE
  * @return pointer to the response string or null to send no response
  */
-static TR_MSG *tids_req_cb(TALLOC_CTX *mem_ctx, TR_MSG *mreq, void *data)
+static TR_GSS_RC tids_req_cb(TALLOC_CTX *mem_ctx, TR_MSG *mreq, TR_MSG **mresp, void *data)
 {
   TALLOC_CTX *tmp_ctx = talloc_new(NULL);
   TIDS_INSTANCE *tids = talloc_get_type_abort(data, TIDS_INSTANCE);
   TID_REQ *req = NULL;
   TID_RESP *resp = NULL;
-  TR_MSG *resp_msg = NULL; /* this is the return value */
-  int rc = 0;
+  TR_GSS_RC rc = TR_GSS_ERROR;
 
   /* If this isn't a TID Request, just drop it. */
   if (mreq->msg_type != TID_REQUEST) {
     tr_debug("tids_req_cb: Not a TID request, dropped.");
+    rc = TR_GSS_INTERNAL_ERROR;
     goto cleanup;
   }
 
@@ -281,40 +281,45 @@ static TR_MSG *tids_req_cb(TALLOC_CTX *mem_ctx, TR_MSG *mreq, void *data)
   req = tr_msg_get_req(mreq);
 
   /* Allocate a response message */
-  resp_msg = talloc(tmp_ctx, TR_MSG);
-  if (resp_msg == NULL) {
+  *mresp = talloc(tmp_ctx, TR_MSG);
+  if (*mresp == NULL) {
     /* We cannot create a response message, so all we can really do is emit
      * an error message and return. */
     tr_crit("tids_req_cb: Error allocating response message.");
+    rc = TR_GSS_INTERNAL_ERROR;
     goto cleanup;
   }
 
   /* Allocate a response structure and populate common fields. Put it in the
    * response message's talloc context. */
-  resp = tids_create_response(resp_msg, req);
+  resp = tids_create_response(mresp, req);
   if (resp == NULL) {
     /* If we were unable to create a response, we cannot reply. Log an
      * error if we can, then drop the request. */
     tr_crit("tids_req_cb: Error creating response structure.");
-    resp_msg = NULL; /* the contents are in tmp_ctx, so they will still be cleaned up */
+    *mresp = NULL; /* the contents are in tmp_ctx, so they will still be cleaned up */
+    rc = TR_GSS_INTERNAL_ERROR;
     goto cleanup;
   }
   /* Now officially assign the response to the message. */
-  tr_msg_set_resp(resp_msg, resp);
+  tr_msg_set_resp(*mresp, resp);
 
   /* Handle the request and fill in resp */
-  rc = tids_handle_request(tids, req, resp);
-  if (rc < 0) {
-    tr_debug("tids_req_cb: Error from tids_handle_request(), rc = %d.", rc);
+  if (tids_handle_request(tids, req, resp) >= 0)
+    rc = TR_GSS_SUCCESS;
+  else {
+    /* The TID request was an error response */
+    tr_debug("tids_req_cb: Error from tids_handle_request");
+    rc = TR_GSS_REQUEST_FAILED;
     /* Fall through, to send the response, either way */
   }
 
   /* put the response message in the caller's context */
-  talloc_steal(mem_ctx, resp_msg);
+  talloc_steal(mem_ctx, *mresp);
 
 cleanup:
   talloc_free(tmp_ctx);
-  return resp_msg;
+  return rc;
 }
 
 static int tids_destructor(void *object)
@@ -402,8 +407,9 @@ nfds_t tids_get_listener(TIDS_INSTANCE *tids,
  * TIDS_MAX_MESSAGE_LEN must be longer than the longest message, including
  * null termination (i.e., strlen() + 1) */
 #define TIDS_MAX_MESSAGE_LEN (10)
-#define TIDS_SUCCESS_MESSAGE "OK"
-#define TIDS_ERROR_MESSAGE   "ERR"
+#define TIDS_SUCCESS_MESSAGE "OK" /* a success message was sent */
+#define TIDS_ERROR_MESSAGE   "ERR" /* an error message was sent */
+#define TIDS_REQ_FAIL_MESSAGE "FAIL" /* sending failed */
 
 /**
  * Process to handle an incoming TIDS request
@@ -430,9 +436,14 @@ static void tids_handle_proc(TIDS_INSTANCE *tids, int conn_fd, int result_fd)
       response_message = TIDS_SUCCESS_MESSAGE;
       break;
 
+    case TR_GSS_REQUEST_FAILED:
+      response_message = TIDS_ERROR_MESSAGE;
+      break;
+
+    case TR_GSS_INTERNAL_ERROR:
     case TR_GSS_ERROR:
     default:
-      response_message = TIDS_ERROR_MESSAGE;
+      response_message = TIDS_REQ_FAIL_MESSAGE;
       break;
   }
 
@@ -565,7 +576,10 @@ void tids_sweep_procs(TIDS_INSTANCE *tids)
 
     if ((result_len > 0) && (strcmp(result, TIDS_SUCCESS_MESSAGE) == 0)) {
       tids->req_count++;
-      tr_info("tids_sweep_procs: TID process %d exited successfully.", tp.pid);
+      tr_info("tids_sweep_procs: TID process %d exited after successful request.", tp.pid);
+    } else if ((result_len > 0) && (strcmp(result, TIDS_ERROR_MESSAGE) == 0)) {
+      tids->req_error_count++;
+      tr_info("tids_sweep_procs: TID process %d exited after unsuccessful request.", tp.pid);
     } else {
       tids->error_count++;
       tr_info("tids_sweep_procs: TID process %d exited with an error.", tp.pid);