Changeset 2721a75 in mainline for uspace/app/nettest1/nettest1.c
- Timestamp:
- 2010-04-09T16:29:07Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 1ef0fc3
- Parents:
- ddfcfeb2
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/nettest1/nettest1.c
rddfcfeb2 r2721a75 40 40 #include <task.h> 41 41 #include <time.h> 42 #include <arg_parse.h> 42 43 43 44 #include <in.h> … … 46 47 #include <socket.h> 47 48 #include <net_err.h> 49 #include <socket_parse.h> 48 50 49 51 #include "nettest.h" 50 #include "parse.h"51 52 #include "print_error.h" 52 53 … … 113 114 // short options with only one letter 114 115 case 'f': 115 ERROR_PROPAGATE( parse_parameter_name_int(argc, argv, &index, &family, "protocol family", 0,parse_protocol_family));116 ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family)); 116 117 break; 117 118 case 'h': … … 120 121 break; 121 122 case 'm': 122 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &messages, "message count", 0));123 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 0)); 123 124 break; 124 125 case 'n': 125 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &sockets, "socket count", 0));126 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 0)); 126 127 break; 127 128 case 'p': 128 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &value, "port number", 0));129 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); 129 130 port = (uint16_t) value; 130 131 break; 131 132 case 's': 132 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &value, "packet size", 0));133 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); 133 134 size = (value >= 0) ? (size_t) value : 0; 134 135 break; 135 136 case 't': 136 ERROR_PROPAGATE( parse_parameter_name_int(argc, argv, &index, &value, "socket type", 0,parse_socket_type));137 ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type)); 137 138 type = (sock_type_t) value; 138 139 break; … … 143 144 case '-': 144 145 if(str_lcmp(argv[index] + 2, "family=", 7) == 0){ 145 ERROR_PROPAGATE( parse_parameter_name_int(argc, argv, &index, &family, "protocol family", 9,parse_protocol_family));146 ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family)); 146 147 }else if(str_lcmp(argv[index] + 2, "help", 5) == 0){ 147 148 nettest1_print_help(); 148 149 return EOK; 149 150 }else if(str_lcmp(argv[index] + 2, "messages=", 6) == 0){ 150 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &messages, "message count", 8));151 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 8)); 151 152 }else if(str_lcmp(argv[index] + 2, "sockets=", 6) == 0){ 152 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &sockets, "socket count", 8));153 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 8)); 153 154 }else if(str_lcmp(argv[index] + 2, "port=", 5) == 0){ 154 ERROR_PROPAGATE( parse_parameter_int(argc, argv, &index, &value, "port number", 7));155 ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7)); 155 156 port = (uint16_t) value; 156 157 }else if(str_lcmp(argv[index] + 2, "type=", 5) == 0){ 157 ERROR_PROPAGATE( parse_parameter_name_int(argc, argv, &index, &value, "socket type", 7,parse_socket_type));158 ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type)); 158 159 type = (sock_type_t) value; 159 160 }else if(str_lcmp(argv[index] + 2, "verbose", 8) == 0){ 160 161 verbose = 1; 161 162 }else{ 162 print_unrecognized(index, argv[index] + 2);163 163 nettest1_print_help(); 164 164 return EINVAL; … … 166 166 break; 167 167 default: 168 print_unrecognized(index, argv[index] + 1);169 168 nettest1_print_help(); 170 169 return EINVAL; 171 170 } 172 171 }else{ 173 print_unrecognized(index, argv[index]);174 172 nettest1_print_help(); 175 173 return EINVAL;
Note:
See TracChangeset
for help on using the changeset viewer.