Be user friendly in example program.

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

diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c
index 8d2b68d..73c526d 100644 (file)
--- a/lib/examples/client-blocking.c
+++ b/lib/examples/client-blocking.c
@@ -15,7 +15,8 @@
 #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;
@@ -23,13 +24,15 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
   struct rs_packet *req = NULL, *resp = NULL;
   struct rs_error *err = NULL;
 
-  if (rs_context_create (&h, "/usr/share/freeradius/dictionary"))
+  if (rs_context_create (&h))
     return NULL;
 
 #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);
@@ -42,12 +45,14 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
     if (rs_peer_set_secret (server, SECRET))
       goto cleanup;
   }
-#else
-  if (rs_context_read_config (h, av1))
+#else  /* defined (USE_CONFIG_FILE) */
+  if (rs_context_read_config (h, config_fn))
+    goto cleanup;
+  if (rs_context_init_freeradius_dict (h, NULL))
     goto cleanup;
-  if (rs_conn_create (h, &conn, av2))
+  if (rs_conn_create (h, &conn, configuration))
     goto cleanup;
-#endif /* USE_CONFIG_FILE */
+#endif /* defined (USE_CONFIG_FILE) */
 
   if (use_request_object_flag)
     {
@@ -67,12 +72,22 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
     }
 
   if (resp)
-    rs_dump_packet (resp);
+    {
+      rs_dump_packet (resp);
+      if (rs_packet_frpkt (resp)->code == PW_AUTHENTICATION_ACK)
+       printf ("Good auth.\n");
+      else
+       printf ("Bad auth: %d\n", rs_packet_frpkt (resp)->code);
+    }
   else
     fprintf (stderr, "%s: no response\n", __func__);
 
  cleanup:
-  err = rs_err_conn_pop (conn);
+  err = rs_err_ctx_pop (h);
+  if (err == RSE_OK)
+    err = rs_err_conn_pop (conn);
+  if (resp)
+    rs_packet_destroy (resp);
   if (request)
     rs_request_destroy (request);
   if (conn)
@@ -83,6 +98,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[])
 {
@@ -95,6 +117,8 @@ 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)
     {