DTN2-BPQ: comparison apps/dtnrespond/dtnrespond.c

equal deleted inserted replaced

-:1296a0283271
+:333724f2f7cf
 fprintf(stderr, " -N  assert destination endpoint is not a singleton\n");
 fprintf(stderr, " -W  set the do not fragment option\n");
 fprintf(stderr, " -h  help\n");
 fprintf(stderr, " -v  verbose\n");
-return 0;
+return DTN_SUCCESS;
 }
 /*******************************************************************************
 * parse options:
 * set internal variables based on cmd line args.
 // if no reply-to eid set, use the local eid
 if (*reply_eid_name == NULL)
 strncpy(reply_eid_name, local_eid_name, PATH_MAX);
-return 0;
+return DTN_SUCCESS;
 }
 /*******************************************************************************
 * validate options:
 * returns success or exits on failure
 // remove any trailing whitespace
 // by testing if the current char is in the whitespace string
 for (j = strlen(out)-1; strchr(whitespace, in[i]) != NULL; --j)
 	out[j--] = 0;
-return 0;
+return DTN_SUCCESS;
 }
 /*******************************************************************************
 * escape spaces:
 * first move past any leading whitespace
 	fprintf(stderr, "Error: the path %s specified in the matching file"
 			" could not be found\n", path);
 		return -1;
 } else {
 	fclose (file);
-		return 0;
+		return DTN_SUCCESS;
 }
 }
 /*******************************************************************************
 	// read line from matching file
 	// TODO: handle malformed input from matching file
 	if (fgets(line, PATH_MAX, file) == NULL) {
 		break;
-	} else {
-		matching_rule 	= strtok(line, ",");
-		query 			= strtok(NULL, ",");
-		path 	        = strtok(NULL, ",");
-		kind  			= strtok(NULL, ",");
-		expiry			= strtok(NULL, ",");
 	}
+	if (strncmp(line, "#", 1) == 0)
+		continue;
+	matching_rule 	= strtok(line, ",");
+		query 			= strtok(NULL, ",");
+		path 	        = strtok(NULL, ",");
+		kind  			= strtok(NULL, ",");
+		expiry			= strtok(NULL, ",");
 	// match query
 if (atoi(matching_rule) != (int)bpq->matching_rule		||
 			BPQ_MATCHING_RULE_EXACT != bpq->matching_rule		||
 			strlen(query) != bpq->query.query_len 				||
 	continue;
 }
 }
 fclose (file);
-return 0;
+return DTN_SUCCESS;
 }
 /*******************************************************************************
 * bpq to char array
 * encode the following information:
 // close the ipc handle
 if (verbose) fprintf(stdout, "closing connection to dtn router...\n");
 dtn_close(handle);
 if (verbose) fprintf(stdout, "closed connection to dtn router...\n");
-return 0;
+return DTN_SUCCESS;
 // UNREACHABLE CODE if count = 0 //////////////////////////////////////////////
 }

changeset 65	333724f2f7cf
parent 64	1296a0283271
child 66	e1101c5d54a1