X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=lib%2Fexamples%2Fclient-blocking.c;h=a50ee8af5356b70067507054a77041765a0309e1;hb=11570f6201548b957b70e8b93e954538f01d09c7;hp=419be8cc7d92696f62e9be54cd1cc9da9c7f6c41;hpb=a13cddc1331aa1f5e7dca7d1b44482951d2757bf;p=radsecproxy.git

diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c
index 419be8c..a50ee8a 100644
--- a/lib/examples/client-blocking.c
+++ b/lib/examples/client-blocking.c
@@ -1,14 +1,11 @@
-/* RADIUS client doing blocking i/o.  */
+/* RADIUS/RadSec client using libradsec in blocking mode. */
 
 #include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <event2/event.h>
-#include <freeradius/libradius.h>
+#include <assert.h>
 #include <radsec/radsec.h>
-#include <radsec/radsec-impl.h>
 #include <radsec/request.h>
+#include "err.h"
 #include "debug.h"		/* For rs_dump_packet().  */
 
 #define SECRET "sikrit"
@@ -16,23 +13,26 @@
 #define USER_PW "password"
 
 struct rs_error *
-blocking_client (const char *av1, const char *av2, int use_request_object_flag)
+blocking_client (const char *config_fn, const char *configuration,
+                 int use_request_object_flag)
 {
   struct rs_context *h = NULL;
   struct rs_connection *conn = NULL;
   struct rs_request *request = NULL;
   struct rs_packet *req = NULL, *resp = NULL;
   struct rs_error *err = NULL;
+  int r;
 
-  if (rs_context_create (&h))
-    return NULL;
+  r = rs_context_create (&h);
+  if (r)
+    {
+      assert (!"unable to create libradsec context");
+    }
 
 #if !defined (USE_CONFIG_FILE)
   {
     struct rs_peer *server;
 
-    if (rs_context_init_freeradius_dict (h, "/usr/share/freeradius/dictionary"))
-      goto cleanup;
     if (rs_conn_create (h, &conn, NULL))
       goto cleanup;
     rs_conn_set_type (conn, RS_CONN_TYPE_UDP);
@@ -46,11 +46,9 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
       goto cleanup;
   }
 #else  /* defined (USE_CONFIG_FILE) */
-  if (rs_context_read_config (h, av1))
-    goto cleanup;
-  if (rs_context_init_freeradius_dict (h, NULL))
+  if (rs_context_read_config (h, config_fn))
     goto cleanup;
-  if (rs_conn_create (h, &conn, av2))
+  if (rs_conn_create (h, &conn, configuration))
     goto cleanup;
 #endif	/* defined (USE_CONFIG_FILE) */
 
@@ -74,10 +72,10 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
   if (resp)
     {
       rs_dump_packet (resp);
-      if (rs_packet_frpkt (resp)->code == PW_ACCESS_ACCEPT)
+      if (rs_packet_code (resp) == PW_ACCESS_ACCEPT)
 	printf ("Good auth.\n");
       else
-	printf ("Bad auth: %d\n", rs_packet_frpkt (resp)->code);
+	printf ("Bad auth: %d\n", rs_packet_code (resp));
     }
   else
     fprintf (stderr, "%s: no response\n", __func__);
@@ -98,6 +96,13 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
   return err;
 }
 
+void
+usage (int argc, char *argv[])
+{
+  fprintf (stderr, "usage: %s: [-r] config-file config-name\n", argv[0]);
+  exit (1);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -110,10 +115,12 @@ main (int argc, char *argv[])
       argc--;
       argv++;
     }
+  if (argc < 3)
+    usage (argc, argv);
   err = blocking_client (argv[1], argv[2], use_request_object_flag);
   if (err)
     {
-      fprintf (stderr, "%s\n", rs_err_msg (err));
+      fprintf (stderr, "error: %s: %d\n", rs_err_msg (err), rs_err_code (err, 0));
       return rs_err_code (err, 1);
     }
   return 0;