WIP

[radsecproxy.git] / lib / examples / client-blocking.c

diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c
index f14e280..a9a4f32 100644 (file)
--- a/lib/examples/client-blocking.c
+++ b/lib/examples/client-blocking.c
@@ -7,13 +7,16 @@
 #include <event2/event.h>
 #include <freeradius/libradius.h>
 #include <radsec/radsec.h>
+#if defined(USE_REQUEST_OBJECT)
+#include <radsec/request.h>
+#endif
 
 #define SECRET "sikrit"
 #define USER_NAME "bob"
 #define USER_PW "hemligt"
 
 struct rs_error *
-rsx_client (const char *srvname, int srvport)
+blocking_client (const char *av1, const char *av2)
 {
   struct rs_handle *h;
   struct rs_connection *conn;
@@ -25,32 +28,45 @@ rsx_client (const char *srvname, int srvport)
   if (rs_context_create (&h, "/usr/share/freeradius/dictionary"))
     return NULL;
 
-  if (rs_conn_create (h, &conn))
-    return rs_conn_err_pop (conn);
-  if (rs_conn_add_server (conn, &server, RS_CONN_TYPE_UDP, srvname, srvport))
-    return rs_conn_err_pop (conn);
-  rs_server_set_timeout (server, 10);
+  if (rs_conn_create (h, &conn, RS_CONN_TYPE_UDP))
+    return rs_err_conn_pop (conn);
+#if !defined (USE_CONFIG_FILE)
+  if (rs_server_create (conn, &server, NULL))
+    return rs_err_conn_pop (conn);
+  if (rs_server_set_address (server, av1, atoi (av2)))
+    return rs_err_conn_pop (conn);
+  rs_server_set_timeout (server, 1);
   rs_server_set_tries (server, 3);
-  rs_server_set_secret (server, SECRET);
+  if (rs_server_set_secret (server, SECRET))
+    return rs_err_conn_pop (conn);
+#else
+  if (rs_context_config_read (h, av1))
+    return rs_err_ctx_pop (h);
+  if (rs_server_create (conn, &server, av2))
+    return rs_err_conn_pop (conn);
+#endif /* USE_CONFIG_FILE */
 
   if (rs_packet_create_acc_request (conn, &req, USER_NAME, USER_PW))
-    return rs_conn_err_pop (conn);
+    return rs_err_conn_pop (conn);
 
+#if !defined(USE_REQUEST_OBJECT)
   if (rs_packet_send (req, NULL))
-    return rs_conn_err_pop (conn);
+    return rs_err_conn_pop (conn);
   req = NULL;
+  if (rs_conn_receive_packet (conn, &resp))
+    return rs_err_conn_pop (conn);
+#else
+  {
+    struct rs_request *request;
 
-#if 0
-  if (rs_packet_create_acc_request (conn, &req, USER_NAME, USER_PW))
-    return rs_conn_err_pop (conn);
+    if (rs_request_new (conn, &request))
+      return rs_err_conn_pop (conn);
+    if (rs_req_send (request, req, &resp))
+      return rs_err_conn_pop (conn);
+    rs_request_destroy (request);
+  }
+#endif /* !defined(USE_REQUEST_OBJECT) */
 
-  if (rs_packet_send (conn, req, NULL))
-    return rs_conn_err_pop (conn);
-  req = NULL;
-#endif
-
-  if (rs_conn_receive_packet (conn, &resp))
-    return rs_conn_err_pop (conn);
   fr_pkt = rs_packet_frpkt (resp);
   fr_vp = fr_pkt->vps;         /* FIXME: Is there an accessor?  */
   vp_printlist(stdout, fr_vp);
@@ -65,12 +81,8 @@ int
 main (int argc, char *argv[])
 {
   struct rs_error *err;
-  char *host;
-  int port;
 
-  host = strsep (argv + 1, ":");
-  port = atoi (argv[1]);
-  err = rsx_client (host, port);
+  err = blocking_client (argv[1], argv[2]);
   if (err)
     {
       fprintf (stderr, "%s\n", rs_err_msg (err, 0));