Changeset f4f866c in mainline for uspace/app/netecho/netecho.c
- Timestamp:
- 2010-04-23T21:42:26Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6c39a907
- Parents:
- 38aaacc2 (diff), 80badbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/netecho/netecho.c
r38aaacc2 rf4f866c 40 40 #include <str.h> 41 41 #include <task.h> 42 #include <arg_parse.h> 42 43 43 44 #include <in.h> … … 46 47 #include <socket.h> 47 48 #include <net_err.h> 48 49 #include "parse.h" 49 #include <socket_parse.h> 50 50 51 #include "print_error.h" 51 52 … … 128 129 int value; 129 130 130 // print the program label131 printf("Task %d - ", task_get_id());132 printf("%s\n", NAME);133 134 131 // parse the command line arguments 135 132 for(index = 1; index < argc; ++ index){ … … 137 134 switch(argv[index][1]){ 138 135 case 'b': 139 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &backlog, "accepted sockets queue size", 0));136 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &backlog, 0)); 140 137 break; 141 138 case 'c': 142 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &count, "message count", 0));139 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &count, 0)); 143 140 break; 144 141 case 'f': 145 ERROR_PROPAGATE( parse_parameter_name_int(argc, argv, &index, &family, "protocol family", 0,parse_protocol_family));142 ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family)); 146 143 break; 147 144 case 'h': … … 150 147 break; 151 148 case 'p': 152 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &value, "port number", 0));149 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); 153 150 port = (uint16_t) value; 154 151 break; 155 152 case 'r': 156 ERROR_PROPAGATE( parse_parameter_string(argc, argv, &index, &reply, "reply string", 0));153 ERROR_PROPAGATE(arg_parse_string(argc, argv, &index, &reply, 0)); 157 154 break; 158 155 case 's': 159 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &value, "receive size", 0));156 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); 160 157 size = (value >= 0) ? (size_t) value : 0; 161 158 break; 162 159 case 't': 163 ERROR_PROPAGATE( parse_parameter_name_int(argc, argv, &index, &value, "socket type", 0,parse_socket_type));160 ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type)); 164 161 type = (sock_type_t) value; 165 162 break; … … 170 167 case '-': 171 168 if(str_lcmp(argv[index] + 2, "backlog=", 6) == 0){ 172 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &backlog, "accepted sockets queue size", 8));169 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &backlog, 8)); 173 170 }else if(str_lcmp(argv[index] + 2, "count=", 6) == 0){ 174 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &count, "message count", 8));171 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &count, 8)); 175 172 }else if(str_lcmp(argv[index] + 2, "family=", 7) == 0){ 176 ERROR_PROPAGATE( parse_parameter_name_int(argc, argv, &index, &family, "protocol family", 9,parse_protocol_family));173 ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family)); 177 174 }else if(str_lcmp(argv[index] + 2, "help", 5) == 0){ 178 175 echo_print_help(); 179 176 return EOK; 180 177 }else if(str_lcmp(argv[index] + 2, "port=", 5) == 0){ 181 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &value, "port number", 7));178 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7)); 182 179 port = (uint16_t) value; 183 180 }else if(str_lcmp(argv[index] + 2, "reply=", 6) == 0){ 184 ERROR_PROPAGATE( parse_parameter_string(argc, argv, &index, &reply, "reply string", 8));181 ERROR_PROPAGATE(arg_parse_string(argc, argv, &index, &reply, 8)); 185 182 }else if(str_lcmp(argv[index] + 2, "size=", 5) == 0){ 186 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &value, "receive size", 7));183 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7)); 187 184 size = (value >= 0) ? (size_t) value : 0; 188 185 }else if(str_lcmp(argv[index] + 2, "type=", 5) == 0){ 189 ERROR_PROPAGATE( parse_parameter_name_int(argc, argv, &index, &value, "socket type", 7,parse_socket_type));186 ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type)); 190 187 type = (sock_type_t) value; 191 188 }else if(str_lcmp(argv[index] + 2, "verbose", 8) == 0){ 192 189 verbose = 1; 193 190 }else{ 194 print_unrecognized(index, argv[index] + 2);195 191 echo_print_help(); 196 192 return EINVAL; … … 198 194 break; 199 195 default: 200 print_unrecognized(index, argv[index] + 1);201 196 echo_print_help(); 202 197 return EINVAL; 203 198 } 204 199 }else{ 205 print_unrecognized(index, argv[index]);206 200 echo_print_help(); 207 201 return EINVAL;
Note:
See TracChangeset
for help on using the changeset viewer.