Removed "descriptor" types

[frescor/fwp.git] / fwp / lib / fwp / fwp_vres.h

diff --git a/fwp/lib/fwp/fwp_vres.h b/fwp/lib/fwp/fwp_vres.h
index b3c244e8151f24877475f45aada48291f5c06ff8..65bfd9177feae7802707ca0a5b7cfa6b8d76259a 100644 (file)
--- a/fwp/lib/fwp/fwp_vres.h
+++ b/fwp/lib/fwp/fwp_vres.h
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 
 struct fwp_vres;
-typedef struct fwp_vres* fwp_vres_d_t;
+typedef struct fwp_vres fwp_vres_t;
 
 /** WMM defines 4 queues */
 typedef enum  {
@@ -59,15 +59,13 @@ typedef enum  {
        FWP_AC_BK = 3
 } fwp_ac_t;
 
-fwp_ac_t fwp_vres_get_ac(fwp_vres_d_t vresd);
+fwp_ac_t fwp_vres_get_ac(fwp_vres_t *vres);
 
 
 #ifdef _FWP_INTERNALS_
 
 #include "fwp_msgb.h"
 
-typedef struct fwp_vres  fwp_vres_t;
-
 typedef unsigned int fwp_vres_id_t;
 typedef unsigned int fwp_vparam_id_t;
 typedef unsigned long int fwp_budget_t;
@@ -90,16 +88,15 @@ struct fwp_vres_params {
 
 int fwp_vres_table_init(unsigned int max_vres);
 
-fwp_vres_d_t fwp_vres_alloc();
-fwp_vres_id_t fwp_vres_get_id(fwp_vres_d_t vresd);
-int fwp_vres_set_params(fwp_vres_d_t vresd, fwp_vres_params_t *params);
-int fwp_vres_create(fwp_vres_params_t *params, fwp_vres_d_t *vresdp);
-int fwp_vres_destroy(fwp_vres_d_t vresd);
+fwp_vres_t *fwp_vres_alloc();
+fwp_vres_id_t fwp_vres_get_id(fwp_vres_t *vres);
+int fwp_vres_set_params(fwp_vres_t *vres, fwp_vres_params_t *params);
+int fwp_vres_create(fwp_vres_params_t *params, fwp_vres_t **vresp);
+int fwp_vres_destroy(fwp_vres_t *vres);
 
-int fwp_vres_send(fwp_vres_d_t vresd, struct fwp_msgb* msgb);
-/*int _fwp_vres_bind(fwp_vres_d_t vresd, fwp_endpoint_d_t epointd);*/
-int fwp_vres_bind(fwp_vres_d_t vresd, int sockd);
-int fwp_vres_unbind(fwp_vres_d_t vresd);
+int fwp_vres_send(fwp_vres_t *vres, struct fwp_msgb* msgb);
+int fwp_vres_bind(fwp_vres_t *vres, int sockd);
+int fwp_vres_unbind(fwp_vres_t *vres);
 
 extern fwp_vres_params_t fwp_vres_params_default;