]> git.evergreen-ils.org Git - OpenSRF.git/blob - src/srfsh/srfsh.c
Patch from Scott McKellar to fill buffer overflow holes:
[OpenSRF.git] / src / srfsh / srfsh.c
1 #include <opensrf/transport_client.h>
2 #include <opensrf/osrf_message.h>
3 #include <opensrf/osrf_app_session.h>
4 #include <time.h>
5 #include <ctype.h>
6 #include <sys/timeb.h>
7 #include <sys/types.h>
8 #include <sys/wait.h>
9
10 #include <opensrf/utils.h>
11 #include <opensrf/log.h>
12
13 #include <signal.h>
14
15 #include <stdio.h>
16 #include <readline/readline.h>
17 #include <readline/history.h>
18
19 #define SRFSH_PORT 5222
20 #define COMMAND_BUFSIZE 4096
21
22
23 /* shell prompt */
24 static const char* prompt = "srfsh# ";
25
26 static char* history_file = NULL;
27
28 //static int child_dead = 0;
29
30 static char* login_session = NULL;
31
32 /* true if we're pretty printing json results */
33 static int pretty_print = 1;
34 /* true if we're bypassing 'less' */
35 static int raw_print = 0;
36
37 /* our jabber connection */
38 static transport_client* client = NULL; 
39
40 /* the last result we received */
41 static osrf_message* last_result = NULL;
42
43 /* functions */
44 static int parse_request( char* request );
45
46 /* handles router requests */
47 static int handle_router( char* words[] );
48
49 /* utility method for print time data */
50 /* static int handle_time( char* words[] ); */
51
52 /* handles app level requests */
53 static int handle_request( char* words[], int relay );
54 static int handle_set( char* words[]);
55 static int handle_print( char* words[]);
56 static int send_request( char* server, 
57                                   char* method, growing_buffer* buffer, int relay );
58 static int parse_error( char* words[] );
59 static int router_query_servers( const char* server );
60 static int print_help( void );
61
62 //static int srfsh_client_connect();
63 //static char* tabs(int count);
64 //static void sig_child_handler( int s );
65 //static void sig_int_handler( int s );
66
67 static int load_history( void );
68 static int handle_math( char* words[] );
69 static int do_math( int count, int style );
70 static int handle_introspect(char* words[]);
71 static int handle_login( char* words[]);
72
73 static int recv_timeout = 120;
74 static int is_from_script = 0;
75
76 int main( int argc, char* argv[] ) {
77
78         /* --------------------------------------------- */
79         /* see if they have a .srfsh.xml in their home directory */
80         char* home = getenv("HOME");
81         int l = strlen(home) + 36;
82         char fbuf[l];
83         memset(fbuf, 0, l);
84         sprintf(fbuf,"%s/.srfsh.xml",home);
85         
86         if(!access(fbuf, R_OK)) {
87                 if( ! osrf_system_bootstrap_client(fbuf, "srfsh") ) {
88                         fprintf(stderr,"Unable to bootstrap client for requests\n");
89                         osrfLogError( OSRF_LOG_MARK,  "Unable to bootstrap client for requests");
90                         return -1;
91                 }
92
93         } else {
94                 fprintf(stderr,"No Config file found at %s\n", fbuf ); 
95                 return -1;
96         }
97
98         if(argc > 1) {
99                 /* for now.. the first arg is used as a script file for processing */
100                 int f;
101                 if( (f = open(argv[1], O_RDONLY)) == -1 ) {
102                         osrfLogError( OSRF_LOG_MARK, "Unable to open file %s for reading, exiting...", argv[1]);
103                         return -1;
104                 }
105
106                 if(dup2(f, STDIN_FILENO) == -1) {
107                         osrfLogError( OSRF_LOG_MARK, "Unable to duplicate STDIN, exiting...");
108                         return -1;
109                 }
110
111                 close(f);
112                 is_from_script = 1;
113         }
114                 
115         /* --------------------------------------------- */
116         load_history();
117
118
119         client = osrf_system_get_transport_client();
120
121         /* main process loop */
122         int newline_needed = 1;  /* used as boolean */
123         char* request;
124         while((request=readline(prompt))) {
125
126                 // Find first non-whitespace character
127                 
128                 char * cmd = request;
129                 while( isspace( (unsigned char) *cmd ) )
130                         ++cmd;
131
132                 // ignore comments and empty lines
133
134                 if( '\0' == *cmd || '#' == *cmd )
135                         continue;
136
137                 // Remove trailing whitespace.  We know at this point that
138                 // there is at least one non-whitespace character somewhere,
139                 // or we would have already skipped this line.  Hence we
140                 // needn't check to make sure that we don't back up past
141                 // the beginning.
142
143                 {
144                         // The curly braces limit the scope of the end variable
145                         
146                         char * end = cmd + strlen(cmd) - 1;
147                         while( isspace( (unsigned char) *end ) )
148                                 --end;
149                         end[1] = '\0';
150                 }
151
152                 if( !strcasecmp(cmd, "exit") || !strcasecmp(cmd, "quit"))
153                 {
154                         newline_needed = 0;
155                         break; 
156                 }
157                 
158                 char* req_copy = strdup(cmd);
159
160                 parse_request( req_copy ); 
161                 if( request && *cmd ) {
162                         add_history(request);
163                 }
164
165                 free(request);
166                 free(req_copy);
167
168                 fflush(stderr);
169                 fflush(stdout);
170         }
171
172         if( newline_needed ) {
173                 
174                 // We left the readline loop after seeing an EOF, not after
175                 // seeing "quit" or "exit".  So we issue a newline in order
176                 // to avoid leaving a dangling prompt.
177
178                 putchar( '\n' );
179         }
180
181         if(history_file != NULL )
182                 write_history(history_file);
183
184         free(request);
185
186         osrf_system_shutdown();
187         return 0;
188 }
189
190 static int load_history( void ) {
191
192         char* home = getenv("HOME");
193         int l = strlen(home) + 24;
194         char fbuf[l];
195
196         memset(fbuf, 0, l);
197         sprintf(fbuf,"%s/.srfsh_history",home);
198         history_file = strdup(fbuf);
199
200         if(!access(history_file, W_OK | R_OK )) {
201                 history_length = 5000;
202                 read_history(history_file);
203         }
204         return 1;
205 }
206
207
208 static int parse_error( char* words[] ) {
209
210         if( ! words )
211                 return 0;
212
213         growing_buffer * gbuf = buffer_init( 64 );
214         buffer_add( gbuf, *words );
215         while( *++words ) {
216                 buffer_add( gbuf, " " );
217                 buffer_add( gbuf, *words );
218         }
219         fprintf( stderr, "???: %s\n", gbuf->buf );
220         buffer_free( gbuf );
221         
222         return 0;
223
224 }
225
226
227 static int parse_request( char* request ) {
228
229         if( request == NULL )
230                 return 0;
231
232         char* original_request = strdup( request );
233         char* words[COMMAND_BUFSIZE]; 
234         
235         int ret_val = 0;
236         int i = 0;
237
238
239         char* req = request;
240         char* cur_tok = strtok( req, " " );
241
242         if( cur_tok == NULL )
243         {
244                 free( original_request );
245                 return 0;
246         }
247
248         /* Load an array with pointers to    */
249         /* the tokens as defined by strtok() */
250         
251         while(cur_tok != NULL) {
252                 if( i < COMMAND_BUFSIZE - 1 ) {
253                         words[i++] = cur_tok;
254                         cur_tok = strtok( NULL, " " );
255                 } else {
256                         fprintf( stderr, "Too many tokens in command\n" );
257                         free( original_request );
258                         return 1;
259                 }
260         }
261
262         words[i] = NULL;
263         
264         /* pass off to the top level command */
265         if( !strcmp(words[0],"router") ) 
266                 ret_val = handle_router( words );
267
268         /*
269         else if( !strcmp(words[0],"time") ) 
270                 ret_val = handle_time( words );
271                 */
272
273         else if (!strcmp(words[0],"request"))
274                 ret_val = handle_request( words, 0 );
275
276         else if (!strcmp(words[0],"relay"))
277                 ret_val = handle_request( words, 1 );
278
279         else if (!strcmp(words[0],"help"))
280                 ret_val = print_help();
281
282         else if (!strcmp(words[0],"set"))
283                 ret_val = handle_set(words);
284
285         else if (!strcmp(words[0],"print"))
286                 ret_val = handle_print(words);
287
288         else if (!strcmp(words[0],"math_bench"))
289                 ret_val = handle_math(words);
290
291         else if (!strcmp(words[0],"introspect"))
292                 ret_val = handle_introspect(words);
293
294         else if (!strcmp(words[0],"login"))
295                 ret_val = handle_login(words);
296
297         else if (words[0][0] == '!') {
298                 system( original_request + 1 );
299                 ret_val = 1;
300         }
301         
302         free( original_request );
303         
304         if(!ret_val)
305                 return parse_error( words );
306         else
307                 return 1;
308 }
309
310
311 static int handle_introspect(char* words[]) {
312
313         if( ! words[1] )
314                 return 0;
315
316         fprintf(stderr, "--> %s\n", words[1]);
317
318         // Build a command in a suitably-sized
319         // buffer and then parse it
320         
321         size_t len;
322         if( words[2] ) {
323                 static const char text[] = "request %s opensrf.system.method %s";
324                 len = sizeof( text ) + strlen( words[1] ) + strlen( words[2] );
325                 char buf[len];
326                 sprintf( buf, text, words[1], words[2] );
327                 return parse_request( buf );
328
329         } else {
330                 static const char text[] = "request %s opensrf.system.method.all";
331                 len = sizeof( text ) + strlen( words[1] );
332                 char buf[len];
333                 sprintf( buf, text, words[1] );
334                 return parse_request( buf );
335
336         }
337 }
338
339
340 static int handle_login( char* words[]) {
341
342         if( words[1] && words[2]) {
343
344                 char* username          = words[1];
345                 char* password          = words[2];
346                 char* type                      = words[3];
347                 char* orgloc            = words[4];
348                 char* workstation       = words[5];
349                 int orgloci = (orgloc) ? atoi(orgloc) : 0;
350                 if(!type) type = "opac";
351
352                 char login_text[] = "request open-ils.auth open-ils.auth.authenticate.init \"%s\"";
353                 size_t len = sizeof( login_text ) + strlen(username);
354
355                 char buf[len];
356                 buf[0] = '\0';
357                 sprintf( buf, login_text, username );
358                 parse_request(buf);
359
360                 char* hash;
361                 if(last_result && last_result->_result_content) {
362                         jsonObject* r = last_result->_result_content;
363                         hash = jsonObjectGetString(r);
364                 } else return 0;
365
366
367                 char* pass_buf = md5sum(password);
368
369                 size_t both_len = strlen( hash ) + strlen( pass_buf ) + 1;
370                 char both_buf[both_len];
371                 both_buf[0] = '\0';
372                 sprintf(both_buf,"%s%s",hash, pass_buf);
373
374                 char* mess_buf = md5sum(both_buf);
375
376                 growing_buffer* argbuf = buffer_init(64);
377                 buffer_fadd(argbuf, 
378                                 "request open-ils.auth open-ils.auth.authenticate.complete "
379                                 "{ \"username\" : \"%s\", \"password\" : \"%s\"", username, mess_buf );
380
381                 if(type) buffer_fadd( argbuf, ", \"type\" : \"%s\"", type );
382                 if(orgloci) buffer_fadd( argbuf, ", \"org\" : %d", orgloci );
383                 if(workstation) buffer_fadd( argbuf, ", \"workstation\" : \"%s\"", workstation);
384                 buffer_add(argbuf, "}");
385
386                 free(pass_buf);
387                 free(mess_buf);
388
389                 parse_request( argbuf->buf );
390                 buffer_free(argbuf);
391
392                 jsonObject* x = last_result->_result_content;
393                 double authtime = 0;
394                 if(x) {
395                         char* authtoken = jsonObjectGetString(
396                                         jsonObjectGetKey(jsonObjectGetKey(x,"payload"), "authtoken"));
397                         authtime  = jsonObjectGetNumber(
398                                         jsonObjectGetKey(jsonObjectGetKey(x,"payload"), "authtime"));
399                         if(authtoken) login_session = strdup(authtoken);
400                         else login_session = NULL;
401                 }
402                 else login_session = NULL;
403
404                 printf("Login Session: %s.  Session timeout: %f\n", login_session, authtime );
405                 
406                 return 1;
407
408         }
409
410         return 0;
411 }
412
413 static int handle_set( char* words[]) {
414
415         char* variable;
416         if( (variable=words[1]) ) {
417
418                 char* val;
419                 if( (val=words[2]) ) {
420
421                         if(!strcmp(variable,"pretty_print")) {
422                                 if(!strcmp(val,"true")) {
423                                         pretty_print = 1;
424                                         printf("pretty_print = true\n");
425                                         return 1;
426                                 } 
427                                 if(!strcmp(val,"false")) {
428                                         pretty_print = 0;
429                                         printf("pretty_print = false\n");
430                                         return 1;
431                                 } 
432                         }
433
434                         if(!strcmp(variable,"raw_print")) {
435                                 if(!strcmp(val,"true")) {
436                                         raw_print = 1;
437                                         printf("raw_print = true\n");
438                                         return 1;
439                                 } 
440                                 if(!strcmp(val,"false")) {
441                                         raw_print = 0;
442                                         printf("raw_print = false\n");
443                                         return 1;
444                                 } 
445                         }
446
447                 }
448         }
449
450         return 0;
451 }
452
453
454 static int handle_print( char* words[]) {
455
456         char* variable;
457         if( (variable=words[1]) ) {
458                 if(!strcmp(variable,"pretty_print")) {
459                         if(pretty_print) {
460                                 printf("pretty_print = true\n");
461                                 return 1;
462                         } else {
463                                 printf("pretty_print = false\n");
464                                 return 1;
465                         }
466                 }
467
468                 if(!strcmp(variable,"login")) {
469                         printf("login session = %s\n", login_session );
470                         return 1;
471                 }
472
473         }
474         return 0;
475 }
476
477 static int handle_router( char* words[] ) {
478
479         if(!client)
480                 return 1;
481
482         int i;
483
484         if( words[1] ) { 
485                 if( !strcmp(words[1],"query") ) {
486                         
487                         if( words[2] && !strcmp(words[2],"servers") ) {
488                                 for(i=3; i < COMMAND_BUFSIZE - 3 && words[i]; i++ ) {   
489                                         router_query_servers( words[i] );
490                                 }
491                                 return 1;
492                         }
493                         return 0;
494                 }
495                 return 0;
496         }
497         return 0;
498 }
499
500
501
502 static int handle_request( char* words[], int relay ) {
503
504         if(!client)
505                 return 1;
506
507         if(words[1]) {
508                 char* server = words[1];
509                 char* method = words[2];
510                 int i;
511                 growing_buffer* buffer = NULL;
512                 if(!relay) {
513                         buffer = buffer_init(128);
514                         buffer_add(buffer, "[");
515                         for(i = 3; words[i] != NULL; i++ ) {
516                                 /* removes trailing semicolon if user accidentally enters it */
517                                 if( words[i][strlen(words[i])-1] == ';' )
518                                         words[i][strlen(words[i])-1] = '\0';
519                                 buffer_add( buffer, words[i] );
520                                 buffer_add(buffer, " ");
521                         }
522                         buffer_add(buffer, "]");
523                 }
524
525                 return send_request( server, method, buffer, relay );
526         } 
527
528         return 0;
529 }
530
531 int send_request( char* server, 
532                 char* method, growing_buffer* buffer, int relay ) {
533         if( server == NULL || method == NULL )
534                 return 0;
535
536         jsonObject* params = NULL;
537         if( !relay ) {
538                 if( buffer != NULL && buffer->n_used > 0 ) 
539                         params = jsonParseString(buffer->buf);
540         } else {
541                 if(!last_result || ! last_result->_result_content) { 
542                         printf("We're not going to call 'relay' with no result params\n");
543                         return 1;
544                 }
545                 else {
546                         jsonObject* o = jsonNewObject(NULL);
547                         jsonObjectPush(o, last_result->_result_content );
548                         params = o;
549                 }
550         }
551
552
553         if(buffer->n_used > 0 && params == NULL) {
554                 fprintf(stderr, "JSON error detected, not executing\n");
555                 return 1;
556         }
557
558         osrf_app_session* session = osrf_app_client_session_init(server);
559
560         if(!osrf_app_session_connect(session)) {
561                 osrfLogWarning( OSRF_LOG_MARK,  "Unable to connect to remote service %s\n", server );
562                 return 1;
563         }
564
565         double start = get_timestamp_millis();
566         //int req_id = osrf_app_session_make_request( session, params, method, 1, NULL );
567         int req_id = osrf_app_session_make_req( session, params, method, 1, NULL );
568
569
570         osrf_message* omsg = osrf_app_session_request_recv( session, req_id, recv_timeout );
571
572         if(!omsg) 
573                 printf("\nReceived no data from server\n");
574         
575         
576         signal(SIGPIPE, SIG_IGN);
577
578         FILE* less; 
579         if(!is_from_script) less = popen( "less -EX", "w");
580         else less = stdout;
581
582         if( less == NULL ) { less = stdout; }
583
584         growing_buffer* resp_buffer = buffer_init(4096);
585
586         while(omsg) {
587
588                 if(raw_print) {
589
590                         if(omsg->_result_content) {
591         
592                                 osrf_message_free(last_result);
593                                 last_result = omsg;
594         
595                                 char* content;
596         
597                                 if( pretty_print && omsg->_result_content ) {
598                                         char* j = jsonObjectToJSON(omsg->_result_content);
599                                         //content = json_printer(j); 
600                                         content = jsonFormatString(j);
601                                         free(j);
602                                 } else
603                                         content = jsonObjectGetString(omsg->_result_content);
604         
605                                 printf( "\nReceived Data: %s\n", content ); 
606                                 free(content);
607         
608                         } else {
609
610                                 char code[16];
611                                 memset(code, 0, 16);
612                                 sprintf( code, "%d", omsg->status_code );
613                                 buffer_add( resp_buffer, code );
614
615                                 printf( "\nReceived Exception:\nName: %s\nStatus: %s\nStatus: %s\n", 
616                                                 omsg->status_name, omsg->status_text, code );
617
618                                 fflush(stdout);
619                         }
620
621                 } else {
622
623                         if(omsg->_result_content) {
624         
625                                 osrf_message_free(last_result);
626                                 last_result = omsg;
627         
628                                 char* content;
629         
630                                 if( pretty_print && omsg->_result_content ) {
631                                         char* j = jsonObjectToJSON(omsg->_result_content);
632                                         //content = json_printer(j); 
633                                         content = jsonFormatString(j);
634                                         free(j);
635                                 } else
636                                         content = jsonObjectGetString(omsg->_result_content);
637         
638                                 buffer_add( resp_buffer, "\nReceived Data: " ); 
639                                 buffer_add( resp_buffer, content );
640                                 buffer_add( resp_buffer, "\n" );
641                                 free(content);
642         
643                         } else {
644         
645                                 buffer_add( resp_buffer, "\nReceived Exception:\nName: " );
646                                 buffer_add( resp_buffer, omsg->status_name );
647                                 buffer_add( resp_buffer, "\nStatus: " );
648                                 buffer_add( resp_buffer, omsg->status_text );
649                                 buffer_add( resp_buffer, "\nStatus: " );
650                                 char code[16];
651                                 memset(code, 0, 16);
652                                 sprintf( code, "%d", omsg->status_code );
653                                 buffer_add( resp_buffer, code );
654                         }
655                 }
656
657
658                 omsg = osrf_app_session_request_recv( session, req_id, recv_timeout );
659
660         }
661
662         double end = get_timestamp_millis();
663
664         fprintf( less, resp_buffer->buf );
665         buffer_free( resp_buffer );
666         fprintf( less, "\n------------------------------------\n");
667         if( osrf_app_session_request_complete( session, req_id ))
668                 fprintf(less, "Request Completed Successfully\n");
669
670
671         fprintf(less, "Request Time in seconds: %.6f\n", end - start );
672         fprintf(less, "------------------------------------\n");
673
674         pclose(less); 
675
676         osrf_app_session_request_finish( session, req_id );
677         osrf_app_session_disconnect( session );
678         osrf_app_session_destroy( session );
679
680
681         return 1;
682
683
684 }
685
686 /*
687 static int handle_time( char* words[] ) {
688
689         if( ! words[1] ) {
690
691                 char buf[36];
692                 memset(buf,0,36);
693                 get_timestamp(buf);
694                 printf( "%s\n", buf );
695                 return 1;
696         }
697
698         if( words[1] ) {
699                 time_t epoch = (time_t)atoi( words[1] );
700                 char* localtime = strdup( ctime( &epoch ) );
701                 printf( "%s => %s", words[1], localtime );
702                 free(localtime);
703                 return 1;
704         }
705
706         return 0;
707
708 }
709 */
710
711                 
712
713 static int router_query_servers( const char* router_server ) {
714
715         if( ! router_server || strlen(router_server) == 0 ) 
716                 return 0;
717
718         char rbuf[256];
719         memset(rbuf,0,256);
720         sprintf(rbuf,"router@%s/router", router_server );
721                 
722         transport_message* send = 
723                 message_init( "servers", NULL, NULL, rbuf, NULL );
724         message_set_router_info( send, NULL, NULL, NULL, "query", 0 );
725
726         client_send_message( client, send );
727         message_free( send );
728
729         transport_message* recv = client_recv( client, -1 );
730         if( recv == NULL ) {
731                 fprintf(stderr, "NULL message received from router\n");
732                 return 1;
733         }
734         
735         printf( 
736                         "---------------------------------------------------------------------------------\n"
737                         "Received from 'server' query on %s\n"
738                         "---------------------------------------------------------------------------------\n"
739                         "original reg time | latest reg time | last used time | class | server\n"
740                         "---------------------------------------------------------------------------------\n"
741                         "%s"
742                         "---------------------------------------------------------------------------------\n"
743                         , router_server, recv->body );
744
745         message_free( recv );
746         
747         return 1;
748 }
749
750 static int print_help( void ) {
751
752         printf(
753                         "---------------------------------------------------------------------------------\n"
754                         "Commands:\n"
755                         "---------------------------------------------------------------------------------\n"
756                         "help                   - Display this message\n"
757                         "!<command> [args] - Forks and runs the given command in the shell\n"
758                 /*
759                         "time                   - Prints the current time\n"
760                         "time <timestamp>       - Formats seconds since epoch into readable format\n"   
761                 */
762                         "set <variable> <value> - set a srfsh variable (e.g. set pretty_print true )\n"
763                         "print <variable>               - Displays the value of a srfsh variable\n"
764                         "---------------------------------------------------------------------------------\n"
765
766                         "router query servers <server1 [, server2, ...]>\n"
767                         "       - Returns stats on connected services\n"
768                         "\n"
769                         "\n"
770                         "request <service> <method> [ <json formatted string of params> ]\n"
771                         "       - Anything passed in will be wrapped in a json array,\n"
772                         "               so add commas if there is more than one param\n"
773                         "\n"
774                         "\n"
775                         "relay <service> <method>\n"
776                         "       - Performs the requested query using the last received result as the param\n"
777                         "\n"
778                         "\n"
779                         "math_bench <num_batches> [0|1|2]\n"
780                         "       - 0 means don't reconnect, 1 means reconnect after each batch of 4, and\n"
781                         "                2 means reconnect after every request\n"
782                         "\n"
783                         "introspect <service>\n"
784                         "       - prints the API for the service\n"
785                         "\n"
786                         "\n"
787                         "---------------------------------------------------------------------------------\n"
788                         " Commands for Open-ILS\n"
789                         "---------------------------------------------------------------------------------\n"
790                         "login <username> <password>\n"
791                         "       -       Logs into the 'server' and displays the session id\n"
792                         "       - To view the session id later, enter: print login\n"
793                         "---------------------------------------------------------------------------------\n"
794                         "\n"
795                         "\n"
796                         "Note: long output is piped through 'less'.  To search in 'less', type: /<search>\n"
797                         "---------------------------------------------------------------------------------\n"
798                         "\n"
799                         );
800
801         return 1;
802 }
803
804
805 /*
806 static char* tabs(int count) {
807         growing_buffer* buf = buffer_init(24);
808         int i;
809         for(i=0;i!=count;i++)
810                 buffer_add(buf, "  ");
811
812         char* final = buffer_data( buf );
813         buffer_free( buf );
814         return final;
815 }
816 */
817
818
819 static int handle_math( char* words[] ) {
820         if( words[1] )
821                 return do_math( atoi(words[1]), 0 );
822         return 0;
823 }
824
825
826 static int do_math( int count, int style ) {
827
828         osrf_app_session* session = osrf_app_client_session_init(  "opensrf.math" );
829         osrf_app_session_connect(session);
830
831         jsonObject* params = jsonParseString("[]");
832         jsonObjectPush(params,jsonNewObject("1"));
833         jsonObjectPush(params,jsonNewObject("2"));
834
835         char* methods[] = { "add", "sub", "mult", "div" };
836         char* answers[] = { "3", "-1", "2", "0.500000" };
837
838         float times[ count * 4 ];
839         memset(times,0,count*4);
840
841         int k;
842         for(k=0;k!=100;k++) {
843                 if(!(k%10)) 
844                         fprintf(stderr,"|");
845                 else
846                         fprintf(stderr,".");
847         }
848
849         fprintf(stderr,"\n\n");
850
851         int running = 0;
852         int i;
853         for(i=0; i!= count; i++) {
854
855                 int j;
856                 for(j=0; j != 4; j++) {
857
858                         ++running;
859
860                         double start = get_timestamp_millis();
861                         int req_id = osrf_app_session_make_req( session, params, methods[j], 1, NULL );
862                         osrf_message* omsg = osrf_app_session_request_recv( session, req_id, 5 );
863                         double end = get_timestamp_millis();
864
865                         times[(4*i) + j] = end - start;
866
867                         if(omsg) {
868         
869                                 if(omsg->_result_content) {
870                                         char* jsn = jsonObjectToJSON(omsg->_result_content);
871                                         if(!strcmp(jsn, answers[j]))
872                                                 fprintf(stderr, "+");
873                                         else
874                                                 fprintf(stderr, "\n![%s] - should be %s\n", jsn, answers[j] );
875                                         free(jsn);
876                                 }
877
878
879                                 osrf_message_free(omsg);
880                 
881                         } else { fprintf( stderr, "\nempty message for tt: %d\n", req_id ); }
882
883                         osrf_app_session_request_finish( session, req_id );
884
885                         if(style == 2)
886                                 osrf_app_session_disconnect( session );
887
888                         if(!(running%100))
889                                 fprintf(stderr,"\n");
890                 }
891
892                 if(style==1)
893                         osrf_app_session_disconnect( session );
894         }
895
896         osrf_app_session_destroy( session );
897         jsonObjectFree(params);
898
899         int c;
900         float total = 0;
901         for(c=0; c!= count*4; c++) 
902                 total += times[c];
903
904         float avg = total / (count*4); 
905         fprintf(stderr, "\n      Average round trip time: %f\n", avg );
906
907         return 1;
908 }