Changes in uspace/app/netecho/netecho.c [2721a75:849ed54] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/netecho/netecho.c
r2721a75 r849ed54 40 40 #include <str.h> 41 41 #include <task.h> 42 #include <arg_parse.h>43 42 44 43 #include <in.h> … … 47 46 #include <socket.h> 48 47 #include <net_err.h> 49 #include <socket_parse.h> 50 48 49 #include "parse.h" 51 50 #include "print_error.h" 52 51 … … 129 128 int value; 130 129 130 // print the program label 131 printf("Task %d - ", task_get_id()); 132 printf("%s\n", NAME); 133 131 134 // parse the command line arguments 132 135 for(index = 1; index < argc; ++ index){ … … 134 137 switch(argv[index][1]){ 135 138 case 'b': 136 ERROR_PROPAGATE( arg_parse_int(argc, argv, &index, &backlog, 0));139 ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &backlog, "accepted sockets queue size", 0)); 137 140 break; 138 141 case 'c': 139 ERROR_PROPAGATE( arg_parse_int(argc, argv, &index, &count, 0));142 ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &count, "message count", 0)); 140 143 break; 141 144 case 'f': 142 ERROR_PROPAGATE( arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family));145 ERROR_PROPAGATE(parse_parameter_name_int(argc, argv, &index, &family, "protocol family", 0, parse_protocol_family)); 143 146 break; 144 147 case 'h': … … 147 150 break; 148 151 case 'p': 149 ERROR_PROPAGATE( arg_parse_int(argc, argv, &index, &value, 0));152 ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &value, "port number", 0)); 150 153 port = (uint16_t) value; 151 154 break; 152 155 case 'r': 153 ERROR_PROPAGATE( arg_parse_string(argc, argv, &index, &reply, 0));156 ERROR_PROPAGATE(parse_parameter_string(argc, argv, &index, &reply, "reply string", 0)); 154 157 break; 155 158 case 's': 156 ERROR_PROPAGATE( arg_parse_int(argc, argv, &index, &value, 0));159 ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &value, "receive size", 0)); 157 160 size = (value >= 0) ? (size_t) value : 0; 158 161 break; 159 162 case 't': 160 ERROR_PROPAGATE( arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type));163 ERROR_PROPAGATE(parse_parameter_name_int(argc, argv, &index, &value, "socket type", 0, parse_socket_type)); 161 164 type = (sock_type_t) value; 162 165 break; … … 167 170 case '-': 168 171 if(str_lcmp(argv[index] + 2, "backlog=", 6) == 0){ 169 ERROR_PROPAGATE( arg_parse_int(argc, argv, &index, &backlog, 8));172 ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &backlog, "accepted sockets queue size", 8)); 170 173 }else if(str_lcmp(argv[index] + 2, "count=", 6) == 0){ 171 ERROR_PROPAGATE( arg_parse_int(argc, argv, &index, &count, 8));174 ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &count, "message count", 8)); 172 175 }else if(str_lcmp(argv[index] + 2, "family=", 7) == 0){ 173 ERROR_PROPAGATE( arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family));176 ERROR_PROPAGATE(parse_parameter_name_int(argc, argv, &index, &family, "protocol family", 9, parse_protocol_family)); 174 177 }else if(str_lcmp(argv[index] + 2, "help", 5) == 0){ 175 178 echo_print_help(); 176 179 return EOK; 177 180 }else if(str_lcmp(argv[index] + 2, "port=", 5) == 0){ 178 ERROR_PROPAGATE( arg_parse_int(argc, argv, &index, &value, 7));181 ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &value, "port number", 7)); 179 182 port = (uint16_t) value; 180 183 }else if(str_lcmp(argv[index] + 2, "reply=", 6) == 0){ 181 ERROR_PROPAGATE( arg_parse_string(argc, argv, &index, &reply, 8));184 ERROR_PROPAGATE(parse_parameter_string(argc, argv, &index, &reply, "reply string", 8)); 182 185 }else if(str_lcmp(argv[index] + 2, "size=", 5) == 0){ 183 ERROR_PROPAGATE( arg_parse_int(argc, argv, &index, &value, 7));186 ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &value, "receive size", 7)); 184 187 size = (value >= 0) ? (size_t) value : 0; 185 188 }else if(str_lcmp(argv[index] + 2, "type=", 5) == 0){ 186 ERROR_PROPAGATE( arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type));189 ERROR_PROPAGATE(parse_parameter_name_int(argc, argv, &index, &value, "socket type", 7, parse_socket_type)); 187 190 type = (sock_type_t) value; 188 191 }else if(str_lcmp(argv[index] + 2, "verbose", 8) == 0){ 189 192 verbose = 1; 190 193 }else{ 194 print_unrecognized(index, argv[index] + 2); 191 195 echo_print_help(); 192 196 return EINVAL; … … 194 198 break; 195 199 default: 200 print_unrecognized(index, argv[index] + 1); 196 201 echo_print_help(); 197 202 return EINVAL; 198 203 } 199 204 }else{ 205 print_unrecognized(index, argv[index]); 200 206 echo_print_help(); 201 207 return EINVAL;
Note:
See TracChangeset
for help on using the changeset viewer.