#include <assert.h>
-static int retries = 10;
-static float timeout = 3;
+static int success = 0;
+static int retries = 3;
+static float timeout = 5;
static const char *secret = NULL;
static int do_output = 1;
static int totalapp = 0;
static int server_port = 0;
static int packet_code = 0;
-static lrad_ipaddr_t server_ipaddr;
+static fr_ipaddr_t server_ipaddr;
static int resend_count = 1;
static int done = 1;
static int print_filename = 0;
-static lrad_ipaddr_t client_ipaddr;
+static fr_ipaddr_t client_ipaddr;
static int client_port = 0;
static int sockfd;
static int last_used_id = -1;
static rbtree_t *filename_tree = NULL;
-static lrad_packet_list_t *pl = NULL;
+static fr_packet_list_t *pl = NULL;
static int sleep_time = -1;
}
/*
- * Initialize a radclient data structure
+ * Initialize a radclient data structure and add it to
+ * the global linked list.
*/
-static radclient_t *radclient_init(const char *filename)
+static int radclient_init(const char *filename)
{
FILE *fp;
VALUE_PAIR *vp;
- radclient_t *start, *radclient, *prev = NULL;
+ radclient_t *radclient;
int filedone = 0;
int packet_number = 1;
- start = NULL;
assert(filename != NULL);
/*
if (!fp) {
fprintf(stderr, "radclient: Error opening %s: %s\n",
filename, strerror(errno));
- return NULL;
+ return 0;
}
} else {
fp = stdin;
if (!radclient) {
perror("radclient: X");
if (fp != stdin) fclose(fp);
- return NULL; /* memory leak "start" */
+ return 0;
}
memset(radclient, 0, sizeof(*radclient));
radclient->request = rad_alloc(1);
if (!radclient->request) {
- librad_perror("radclient: Y");
- radclient_free(radclient);
+ fr_perror("radclient: Y");
+ free(radclient);
if (fp != stdin) fclose(fp);
- return NULL; /* memory leak "start" */
+ return 0;
}
radclient->filename = filename;
*/
radclient->request->vps = readvp2(fp, &filedone, "radclient:");
if (!radclient->request->vps) {
- radclient_free(radclient);
+ rad_free(&radclient->request);
+ free(radclient);
if (fp != stdin) fclose(fp);
- return start; /* done: return the list */
+ return 1;
}
/*
}
} /* loop over the VP's we read in */
- if (!start) {
- start = radclient;
- prev = start;
+ /*
+ * Add it to the tail of the list.
+ */
+ if (!radclient_head) {
+ assert(radclient_tail == NULL);
+ radclient_head = radclient;
+ radclient->prev = NULL;
} else {
- prev->next = radclient;
- radclient->prev = prev;
- prev = radclient;
+ assert(radclient_tail->next == NULL);
+ radclient_tail->next = radclient;
+ radclient->prev = radclient_tail;
}
+ radclient_tail = radclient;
+ radclient->next = NULL;
+
} while (!filedone); /* loop until the file is done. */
if (fp != stdin) fclose(fp);
/*
* And we're done.
*/
- return start;
+ return 1;
}
static int filename_walk(void *context, void *data)
{
const char *filename = data;
- radclient_t *radclient;
context = context; /* -Wunused */
/*
- * Initialize the request we're about
- * to send.
+ * Read request(s) from the file.
*/
- radclient = radclient_init(filename);
- if (!radclient) {
- exit(1);
+ if (!radclient_init(filename)) {
+ return 1; /* stop walking */
}
- if (!radclient_head) {
- assert(radclient_tail == NULL);
- radclient_head = radclient;
- } else {
- assert(radclient_tail->next == NULL);
- radclient_tail->next = radclient;
- radclient->prev = radclient_tail;
- }
-
- /*
- * We may have had a list of "radclient" structures
- * returned to us.
- */
- while (radclient->next) radclient = radclient->next;
- radclient_tail = radclient;
-
return 0;
}
/*
* One more unused RADIUS ID.
*/
- lrad_packet_list_id_free(pl, radclient->request);
+ fr_packet_list_id_free(pl, radclient->request);
radclient->request->id = -1;
/*
* this packet.
*/
retry:
- rcode = lrad_packet_list_id_alloc(pl, radclient->request);
+ rcode = fr_packet_list_id_alloc(pl, radclient->request);
if (rcode < 0) {
int mysockfd;
- mysockfd = lrad_socket(&client_ipaddr, 0);
+ mysockfd = fr_socket(&client_ipaddr, 0);
if (!mysockfd) {
fprintf(stderr, "radclient: Can't open new socket\n");
exit(1);
}
- if (!lrad_packet_list_socket_add(pl, mysockfd)) {
+ if (!fr_packet_list_socket_add(pl, mysockfd)) {
fprintf(stderr, "radclient: Can't add new socket\n");
exit(1);
}
assert(radclient->request->data == NULL);
for (i = 0; i < 4; i++) {
- *((uint32_t *) radclient->request->vector) = lrad_rand();
+ ((uint32_t *) radclient->request->vector)[i] = fr_rand();
}
/*
/*
* Duplicate found. Serious error!
*/
- if (!lrad_packet_list_insert(pl, &radclient->request)) {
+ if (!fr_packet_list_insert(pl, &radclient->request)) {
assert(0 == 1);
}
* Delete the request from the tree of
* outstanding requests.
*/
- lrad_packet_list_yank(pl, radclient->request);
+ fr_packet_list_yank(pl, radclient->request);
fprintf(stderr, "radclient: no response from server for ID %d socket %d\n", radclient->request->id, radclient->request->sockfd);
deallocate_id(radclient);
*/
if (rad_send(radclient->request, NULL, secret) < 0) {
fprintf(stderr, "radclient: Failed to send packet for ID %d: %s\n",
- radclient->request->id, librad_errstr);
+ radclient->request->id, fr_strerror());
}
- if (librad_debug > 2) print_hex(radclient->request);
+ if (fr_debug_flag > 2) print_hex(radclient->request);
return 0;
}
/* And wait for reply, timing out as necessary */
FD_ZERO(&set);
- max_fd = lrad_packet_list_fd_set(pl, &set);
+ max_fd = fr_packet_list_fd_set(pl, &set);
if (max_fd < 0) exit(1); /* no sockets to listen on! */
if (wait_time <= 0) {
/*
* Look for the packet.
*/
- reply = lrad_packet_list_recv(pl, &set);
+ reply = fr_packet_list_recv(pl, &set);
if (!reply) {
fprintf(stderr, "radclient: received bad packet: %s\n",
- librad_errstr);
+ fr_strerror());
return -1; /* bad packet */
}
*/
reply->dst_ipaddr = client_ipaddr;
- if (librad_debug > 2) print_hex(reply);
+ if (fr_debug_flag > 2) print_hex(reply);
- request_p = lrad_packet_list_find_byreply(pl, reply);
+ request_p = fr_packet_list_find_byreply(pl, reply);
if (!request_p) {
fprintf(stderr, "radclient: received response to request we did not send. (id=%d socket %d)\n", reply->id, reply->sockfd);
rad_free(&reply);
return -1; /* got reply to packet we didn't send */
}
- radclient = lrad_packet2myptr(radclient_t, request, request_p);
+ radclient = fr_packet2myptr(radclient_t, request, request_p);
/*
* Fails the signature validation: not a real reply.
* FIXME: Silently drop it and listen for another packet.
*/
if (rad_verify(reply, radclient->request, secret) < 0) {
- librad_perror("rad_verify");
+ fr_perror("rad_verify");
totallost++;
goto packet_done; /* shared secret is incorrect */
}
- lrad_packet_list_yank(pl, radclient->request);
+ fr_packet_list_yank(pl, radclient->request);
if (print_filename) printf("%s:%d %d\n",
radclient->filename,
radclient->packet_number,
reply->code);
deallocate_id(radclient);
radclient->reply = reply;
+ reply = NULL;
/*
* If this fails, we're out of memory.
*/
- if (rad_decode(reply, radclient->request, secret) != 0) {
- librad_perror("rad_decode");
+ if (rad_decode(radclient->reply, radclient->request, secret) != 0) {
+ fr_perror("rad_decode");
totallost++;
goto packet_done;
}
/* libradius debug already prints out the value pairs for us */
- if (!librad_debug && do_output) {
+ if (!fr_debug_flag && do_output) {
printf("Received response ID %d, code %d, length = %d\n",
- reply->id, reply->code, reply->data_len);
- vp_printlist(stdout, reply->vps);
+ radclient->reply->id, radclient->reply->code,
+ radclient->reply->data_len);
+ vp_printlist(stdout, radclient->reply->vps);
}
- if (reply->code != PW_AUTHENTICATION_REJECT) {
+
+ if ((radclient->reply->code == PW_AUTHENTICATION_ACK) ||
+ (radclient->reply->code == PW_ACCOUNTING_RESPONSE) ||
+ (radclient->reply->code == PW_COA_ACK) ||
+ (radclient->reply->code == PW_DISCONNECT_ACK)) {
+ success = 1; /* have a good response */
totalapp++;
} else {
totaldeny++;
}
- radclient->done = 1;
+
+ if (radclient->resend == resend_count) {
+ radclient->done = 1;
+ }
packet_done:
rad_free(&radclient->reply);
+ rad_free(&reply); /* may be NULL */
return 0;
}
radclient_t *this;
int force_af = AF_UNSPEC;
- librad_debug = 0;
+ fr_debug_flag = 0;
filename_tree = rbtree_create(filename_cmp, NULL, 0);
if (!filename_tree) {
case 'q':
do_output = 0;
+ fr_log_fp = NULL; /* no output from you, either! */
break;
case 'r':
if (!isdigit((int) *optarg))
exit(0);
break;
case 'x':
- librad_debug++;
+ fr_debug_flag++;
+ fr_log_fp = stdout;
break;
case 'h':
default:
}
if (dict_init(radius_dir, RADIUS_DICTIONARY) < 0) {
- librad_perror("radclient");
+ fr_perror("radclient");
return 1;
}
if (*argv[1] == '[') { /* IPv6 URL encoded */
p = strchr(argv[1], ']');
- if ((p - argv[1]) >= sizeof(buffer)) {
+ if ((size_t) (p - argv[1]) >= sizeof(buffer)) {
usage();
}
packet_code = PW_STATUS_SERVER;
} else if (strcmp(argv[2], "disconnect") == 0) {
- if (server_port == 0) server_port = PW_POD_UDP_PORT;
+ if (server_port == 0) server_port = PW_COA_UDP_PORT;
packet_code = PW_DISCONNECT_REQUEST;
} else if (strcmp(argv[2], "coa") == 0) {
- if (server_port == 0) server_port = PW_POD_UDP_PORT;
+ if (server_port == 0) server_port = PW_COA_UDP_PORT;
packet_code = PW_COA_REQUEST;
} else if (strcmp(argv[2], "auto") == 0) {
client_ipaddr = radclient_head->request->src_ipaddr;
client_port = radclient_head->request->src_port;
}
- sockfd = lrad_socket(&client_ipaddr, client_port);
+ sockfd = fr_socket(&client_ipaddr, client_port);
if (sockfd < 0) {
- fprintf(stderr, "radclient: socket: %s\n", librad_errstr);
+ fprintf(stderr, "radclient: socket: %s\n", fr_strerror());
exit(1);
}
- pl = lrad_packet_list_create(1);
+ pl = fr_packet_list_create(1);
if (!pl) {
fprintf(stderr, "radclient: Out of memory\n");
exit(1);
}
- if (!lrad_packet_list_socket_add(pl, sockfd)) {
+ if (!fr_packet_list_socket_add(pl, sockfd)) {
fprintf(stderr, "radclient: Out of memory\n");
exit(1);
}
/*
* Still have outstanding requests.
*/
- if (lrad_packet_list_num_elements(pl) > 0) {
+ if (fr_packet_list_num_elements(pl) > 0) {
done = 0;
} else {
sleep_time = 0;
} while (!done);
rbtree_free(filename_tree);
- lrad_packet_list_free(pl);
+ fr_packet_list_free(pl);
+ while (radclient_head) radclient_free(radclient_head);
dict_free();
if (do_summary) {
printf("\t Total lost auths: %d\n", totallost);
}
- return 0;
+ if (success) return 0;
+
+ return 1;
}
projects / freeradius.git / blobdiff