remove rs_packet_frpkt

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

diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c
index 31fd6d1..2cfd617 100644 (file)
--- a/lib/examples/client-blocking.c
+++ b/lib/examples/client-blocking.c
@@ -5,13 +5,13 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <event2/event.h>
-#include <freeradius/libradius.h>
 #include <radsec/radsec.h>
+#include <radsec/radsec-impl.h>
 #include <radsec/request.h>
 #include "debug.h"             /* For rs_dump_packet().  */
 
 #define SECRET "sikrit"
-#define USER_NAME "molgan"
+#define USER_NAME "molgan@PROJECT-MOONSHOT.ORG"
 #define USER_PW "password"
 
 struct rs_error *
@@ -21,8 +21,9 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
   struct rs_connection *conn = NULL;
   struct rs_request *request = NULL;
   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)
@@ -41,12 +42,12 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
     if (rs_peer_set_secret (server, SECRET))
       goto cleanup;
   }
-#else
+#else  /* defined (USE_CONFIG_FILE) */
   if (rs_context_read_config (h, av1))
     goto cleanup;
   if (rs_conn_create (h, &conn, av2))
     goto cleanup;
-#endif /* USE_CONFIG_FILE */
+#endif /* defined (USE_CONFIG_FILE) */
 
   if (use_request_object_flag)
     {
@@ -66,23 +67,30 @@ 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_code (resp) == PW_ACCESS_ACCEPT)
+       printf ("Good auth.\n");
+      else
+       printf ("Bad auth: %d\n", rs_packet_code (resp));
+    }
   else
     fprintf (stderr, "%s: no response\n", __func__);
 
  cleanup:
+  err = rs_err_ctx_pop (h);
+  if (err == RSE_OK)
+    err = rs_err_conn_pop (conn);
   if (resp)
     rs_packet_destroy (resp);
-  if (req)
-    rs_packet_destroy (req);
-  if (conn)
-    rs_conn_destroy (conn);
   if (request)
     rs_request_destroy (request);
+  if (conn)
+    rs_conn_destroy (conn);
   if (h)
     rs_context_destroy (h);
 
-  return rs_err_conn_pop (conn);
+  return err;
 }
 
 int
@@ -100,7 +108,7 @@ main (int argc, char *argv[])
   err = blocking_client (argv[1], argv[2], use_request_object_flag);
   if (err)
     {
-      fprintf (stderr, "%s\n", rs_err_msg (err, 0));
+      fprintf (stderr, "%s\n", rs_err_msg (err));
       return rs_err_code (err, 1);
     }
   return 0;