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

equal deleted inserted replaced

-:3d1ea31e2a19
+:ce4cfc1cb1b6
 {
 fprintf(stderr, "usage: %s -l < local endpoint > -f < matching filename > "
 "[opts]\n", progname);
 fprintf(stderr, "options:\n");
 fprintf(stderr, " -n  < count > exit after count bundles received\n");
+fprintf(stderr, " -r  < eid > reply to endpoint\n");
 fprintf(stderr, " -e  < seconds > bundle expiry time\n");
 fprintf(stderr, " -i  < regid > existing registration id\n");
 fprintf(stderr, " -E  < seconds > registration expiry time\n");
 fprintf(stderr, " -A  < defer | drop | exec > failure action\n");
 fprintf(stderr, " -S  < script > failure script for exec action\n");
 * returns success or exits on failure.
 *******************************************************************************/
 int
 parse_options(int argc, char** argv,
 char * local_eid_name,              // l
+char * reply_eid_name,              // r
 char * matching_filename,           // f
 int * count,                        // n
 dtn_timeval_t * bundle_expiry,      // e
 dtn_reg_id_t * regid,               // i
 dtn_timeval_t * reg_expiry,         // E
 progname = argv[0];
 //initialize strings
 memset(local_eid_name,    0, sizeof(char) * PATH_MAX);
+memset(reply_eid_name,    0, sizeof(char) * PATH_MAX);
 memset(matching_filename, 0, sizeof(char) * PATH_MAX);
 memset(reg_fail_script,   0, sizeof(char) * PATH_MAX);
 while( !done )
 {
 c = getopt(argc, argv, "l:f:n:e:i:E:A:S:P:DXFRcC1NWvhH");
 switch(c)
 {
 case 'l':
 strncpy(local_eid_name, optarg, PATH_MAX);
+break;
+case 'r':
+strncpy(reply_eid_name, optarg, PATH_MAX);
 break;
 case 'f':
 strncpy(matching_filename, optarg, PATH_MAX);
 break;
 case 'n':
 // getopt already prints error message for unknown option characters
 usage();
 exit(1);
 }
 }
+// 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;
 }
 /*******************************************************************************
 * validate options:
 * returns success or exits on failure
 *******************************************************************************/
 int
-validate_options(const char * local_eid_name, const char * matching_filename)
+validate_options(const char * local_eid_name,
+const char * reply_eid_name,
+const char * matching_filename)
 {
 #define REQUIRE(test, err_msg) \
 if(!test) { \
 fprintf(stderr, err_msg); \
 usage(); \
 exit(1); \
 }
 REQUIRE(strlen(local_eid_name) > 0, "-l <local eid> required\n");
+REQUIRE(strlen(reply_eid_name) > 0, "-r <reply eid> required\n");
 REQUIRE(strlen(matching_filename) > 0, "-f <matching filename> required\n");
 return 0;
 }
 return DTN_SUCCESS;
 }
 /*******************************************************************************
+* parse eid:
+*
+* code lifted from dtnsend
+* todo: check this
+*******************************************************************************/
+dtn_endpoint_id_t *
+parse_eid(dtn_handle_t handle,
+dtn_endpoint_id_t * eid,
+const char * str,
+int verbose)
+{
+// try the string as an actual dtn eid
+if (dtn_parse_eid_string(eid, str) == DTN_SUCCESS) {
+if (verbose) fprintf(stdout, "%s (literal)\n", str);
+return eid;
+}
+// build a local eid based on the configuration of our dtn
+// router plus the str as demux string
+else if (dtn_build_local_eid(handle, eid, str) == DTN_SUCCESS) {
+if (verbose) fprintf(stdout, "%s (local)\n", str);
+return eid;
+}
+else {
+fprintf(stderr, "invalid eid string '%s'\n", str);
+exit(1);
+}
+}
+/*******************************************************************************
 * trim whitespace:
 * first move past any leading whitespace
 * after the first non-whitespace char bef=gin copying to output
 * finish by setting any trailing whitespace to 0
 * @return 0 on success or -1 if input not completely read
 *******************************************************************************/
 int
 send_response_bpq(dtn_handle_t * handle,
 dtn_reg_id_t regid,
 dtn_bundle_spec_t * query_bundle_spec,
+const dtn_endpoint_id_t * reply_eid,
 dtn_bpq_extension_block_data_t * query_bpq_block_data,
 const char * pathname,
 int bundle_expiry,
 dtn_bundle_priority_t  priority,
 int delivery_options,
 response_bpq_block.flags = DTN_BPQ_BLOCK_FLAGS;
 response_bpq_block.data.data_len = buf_len;
 response_bpq_block.data.data_val = buf;
 // copy dest src
-dtn_copy_eid(&response_bundle_spec.dest,    &(query_bundle_spec->source));
+dtn_copy_eid(&response_bundle_spec.dest,    &(query_bundle_spec->replyto));
 dtn_copy_eid(&response_bundle_spec.source,  &(query_bundle_spec->dest));
-dtn_copy_eid(&response_bundle_spec.replyto, &(query_bundle_spec->dest));
+dtn_copy_eid(&response_bundle_spec.replyto, reply_eid);
 // set the bundle spec dtn options
 response_bundle_spec.expiration = bundle_expiry;
 response_bundle_spec.dopts = delivery_options;
 response_bundle_spec.priority = priority;
 * source of the query.
 *******************************************************************************/
 int
 receive_bpq(dtn_handle_t * handle,
 dtn_reg_id_t regid,
+const dtn_endpoint_id_t * reply_eid,
 const char * matching_filename,
 int  count,
 int bundle_expiry,
 dtn_bundle_priority_t  priority,
 int delivery_options,
 bpq_block_data.query.query_val);
 ret = send_response_bpq(handle,
 regid,
 &bundle_spec,
+reply_eid,
 &bpq_block_data,
 pathname,
 bundle_expiry,
 priority,
 delivery_options,
 *******************************************************************************/
 int
 main(int argc, char** argv)
 {
 dtn_endpoint_id_t local_eid;
+dtn_endpoint_id_t reply_eid;
 char local_eid_name[PATH_MAX];
+char reply_eid_name[PATH_MAX];
 char matching_filename[PATH_MAX];
 int count = -1;                                     //forever
 dtn_timeval_t bundle_expiry = 3600;                 //one hour
 dtn_reg_id_t regid = DTN_REGID_NONE;
 dtn_timeval_t reg_expiry = 30;
 int err = 0;
 dtn_handle_t handle;
 parse_options(argc, argv,
 local_eid_name,
+reply_eid_name,
 matching_filename,
 &count,
 &bundle_expiry,
 &regid,
 &reg_expiry,
 reg_fail_script,
 &priority,
 &delivery_options,
 &verbose);
-validate_options(local_eid_name, matching_filename);
+validate_options(local_eid_name, reply_eid_name, matching_filename);
 // open the ipc handle
 if (verbose) fprintf(stdout, "opening connection to dtn router...\n");
 if ((err = dtn_open(&handle)) != DTN_SUCCESS) {
 fprintf(stderr, "fatal error opening dtn handle: %s\n",
 dtn_strerror(err));
 exit(1);
 }
 if (verbose) fprintf(stdout, "opened connection to dtn router...\n");
+parse_eid(handle, &reply_eid, reply_eid_name, verbose);
+if (verbose) fprintf(stdout, "parsed reply_eid: %s\n", reply_eid.uri);
 // get dtn registration
 if (verbose) fprintf(stdout, "registering with dtn...\n");
 register_with_dtn(handle,
 &local_eid,
 // get to work
 // this fn will likely never exit so the handle won't be closed...
 receive_bpq(&handle,
 regid,
+&reply_eid,
 matching_filename,
 count,
 bundle_expiry,
 priority,
 delivery_options,

changeset 19	ce4cfc1cb1b6
parent 8	ce3cb8a86959
child 20	7fd5f0de6c59