denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libfast: add a fast_ prefix to all classes, avoiding namespace clashes

Browse Source
This commit is contained in:
Martin Willi
2013-07-18 12:24:38 +02:00
parent 569d114de8
commit 890f20989f
34 changed files with 372 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/medsrv/controller/peer_controller.c
+11 -12
View File
@@ -52,7 +52,7 @@ struct private_peer_controller_t {
/**
* list the configured peer configs
*/
static void list(private_peer_controller_t *this, request_t *request)
static void list(private_peer_controller_t *this, fast_request_t *request)
{
enumerator_t *query;
@@ -83,7 +83,7 @@ static void list(private_peer_controller_t *this, request_t *request)
/**
* verify a peer alias
*/
static bool verify_alias(private_peer_controller_t *this, request_t *request,
static bool verify_alias(private_peer_controller_t *this, fast_request_t *request,
char *alias)
{
if (!alias || *alias == '\0')
@@ -117,7 +117,7 @@ static bool verify_alias(private_peer_controller_t *this, request_t *request,
* parse and verify a public key
*/
static bool parse_public_key(private_peer_controller_t *this,
request_t *request, char *public_key,
fast_request_t *request, char *public_key,
chunk_t *encoding, chunk_t *keyid)
{
public_key_t *public;
@@ -153,7 +153,7 @@ static bool parse_public_key(private_peer_controller_t *this,
/**
* register a new peer
*/
static void add(private_peer_controller_t *this, request_t *request)
static void add(private_peer_controller_t *this, fast_request_t *request)
{
char *alias = "", *public_key = "";
@@ -231,7 +231,7 @@ char* pem_encode(chunk_t der)
/**
* edit a peer
*/
static void edit(private_peer_controller_t *this, request_t *request, int id)
static void edit(private_peer_controller_t *this, fast_request_t *request, int id)
{
char *alias = "", *public_key = "", *pem;
chunk_t encoding, keyid;
@@ -305,21 +305,21 @@ static void edit(private_peer_controller_t *this, request_t *request, int id)
/**
* delete a peer from the database
*/
static void delete(private_peer_controller_t *this, request_t *request, int id)
static void delete(private_peer_controller_t *this, fast_request_t *request, int id)
{
this->db->execute(this->db, NULL,
"DELETE FROM peer WHERE id = ? AND user = ?",
DB_INT, id, DB_UINT, this->user->get_user(this->user));
}
METHOD(controller_t, get_name, char*,
METHOD(fast_controller_t, get_name, char*,
private_peer_controller_t *this)
{
return "peer";
}
METHOD(controller_t, handle, void,
private_peer_controller_t *this, request_t *request, char *action,
METHOD(fast_controller_t, handle, void,
private_peer_controller_t *this, fast_request_t *request, char *action,
char *idstr, char *p3, char *p4, char *p5)
{
if (action)
@@ -350,7 +350,7 @@ METHOD(controller_t, handle, void,
request->redirect(request, "peer/list");
}
METHOD(controller_t, destroy, void,
METHOD(fast_controller_t, destroy, void,
private_peer_controller_t *this)
{
free(this);
@@ -359,7 +359,7 @@ METHOD(controller_t, destroy, void,
/*
* see header file
*/
controller_t *peer_controller_create(user_t *user, database_t *db)
fast_controller_t *peer_controller_create(user_t *user, database_t *db)
{
private_peer_controller_t *this;
@@ -377,4 +377,3 @@ controller_t *peer_controller_create(user_t *user, database_t *db)
return &this->public.controller;
}
src/medsrv/controller/peer_controller.h
+3 -3
View File
@@ -24,7 +24,7 @@
#include <user.h>
#include <controller.h>
#include <fast_controller.h>
#include <database/database.h>
typedef struct peer_controller_t peer_controller_t;
@@ -37,12 +37,12 @@ struct peer_controller_t {
/**
* Implements controller_t interface.
*/
controller_t controller;
fast_controller_t controller;
};
/**
* Create a peer_controller controller instance.
*/
controller_t *peer_controller_create(user_t *user, database_t *db);
fast_controller_t *peer_controller_create(user_t *user, database_t *db);
#endif /** PEER_CONTROLLER_H_ @}*/
src/medsrv/controller/user_controller.c
+13 -13
View File
@@ -76,7 +76,7 @@ static chunk_t hash_password(char *login, char *password)
/**
* Login a user.
*/
static void login(private_user_controller_t *this, request_t *request)
static void login(private_user_controller_t *this, fast_request_t *request)
{
if (request->get_query_data(request, "submit"))
{
@@ -115,7 +115,7 @@ static void login(private_user_controller_t *this, request_t *request)
/**
* Logout a user.
*/
static void logout(private_user_controller_t *this, request_t *request)
static void logout(private_user_controller_t *this, fast_request_t *request)
{
request->redirect(request, "user/login");
request->close_session(request);
@@ -124,8 +124,8 @@ static void logout(private_user_controller_t *this, request_t *request)
/**
* verify a user entered username for validity
*/
static bool verify_login(private_user_controller_t *this, request_t *request,
char *login)
static bool verify_login(private_user_controller_t *this,
fast_request_t *request, char *login)
{
if (!login || *login == '\0')
{
@@ -156,7 +156,8 @@ static bool verify_login(private_user_controller_t *this, request_t *request,
/**
* verify a user entered password for validity
*/
static bool verify_password(private_user_controller_t *this, request_t *request,
static bool verify_password(private_user_controller_t *this,
fast_request_t *request,
char *password, char *confirm)
{
if (!password || *password == '\0')
@@ -181,7 +182,7 @@ static bool verify_password(private_user_controller_t *this, request_t *request,
/**
* Register a user.
*/
static void add(private_user_controller_t *this, request_t *request)
static void add(private_user_controller_t *this, fast_request_t *request)
{
char *login = "";
@@ -222,7 +223,7 @@ static void add(private_user_controller_t *this, request_t *request)
/**
* Edit the logged in user
*/
static void edit(private_user_controller_t *this, request_t *request)
static void edit(private_user_controller_t *this, fast_request_t *request)
{
enumerator_t *query;
char *old_login;
@@ -297,14 +298,14 @@ static void edit(private_user_controller_t *this, request_t *request)
request->render(request, "templates/user/edit.cs");
}
METHOD(controller_t, get_name, char*,
METHOD(fast_controller_t, get_name, char*,
private_user_controller_t *this)
{
return "user";
}
METHOD(controller_t, handle, void,
private_user_controller_t *this, request_t *request, char *action,
METHOD(fast_controller_t, handle, void,
private_user_controller_t *this, fast_request_t *request, char *action,
char *p2, char *p3, char *p4, char *p5)
{
if (action)
@@ -333,7 +334,7 @@ METHOD(controller_t, handle, void,
request->redirect(request, "user/login");
}
METHOD(controller_t, destroy, void,
METHOD(fast_controller_t, destroy, void,
private_user_controller_t *this)
{
free(this);
@@ -342,7 +343,7 @@ METHOD(controller_t, destroy, void,
/*
* see header file
*/
controller_t *user_controller_create(user_t *user, database_t *db)
fast_controller_t *user_controller_create(user_t *user, database_t *db)
{
private_user_controller_t *this;
@@ -362,4 +363,3 @@ controller_t *user_controller_create(user_t *user, database_t *db)
return &this->public.controller;
}
src/medsrv/controller/user_controller.h
+3 -3
View File
@@ -24,7 +24,7 @@
#include <user.h>
#include <controller.h>
#include <fast_controller.h>
#include <database/database.h>
typedef struct user_controller_t user_controller_t;
@@ -37,12 +37,12 @@ struct user_controller_t {
/**
* Implements controller_t interface.
*/
controller_t controller;
fast_controller_t controller;
};
/**
* Create a user_controller controller instance.
*/
controller_t *user_controller_create(user_t *user, database_t *db);
fast_controller_t *user_controller_create(user_t *user, database_t *db);
#endif /** USER_CONTROLLER_H_ @}*/
src/medsrv/filter/auth_filter.c
+4 -5
View File
@@ -40,8 +40,8 @@ struct private_auth_filter_t {
database_t *db;
};
METHOD(filter_t, run, bool,
private_auth_filter_t *this, request_t *request, char *controller,
METHOD(fast_filter_t, run, bool,
private_auth_filter_t *this, fast_request_t *request, char *controller,
char *action, char *p2, char *p3, char *p4, char *p5)
{
if (this->user->get_user(this->user))
@@ -70,7 +70,7 @@ METHOD(filter_t, run, bool,
return FALSE;
}
METHOD(filter_t, destroy, void,
METHOD(fast_filter_t, destroy, void,
private_auth_filter_t *this)
{
free(this);
@@ -79,7 +79,7 @@ METHOD(filter_t, destroy, void,
/*
* see header file
*/
filter_t *auth_filter_create(user_t *user, database_t *db)
fast_filter_t *auth_filter_create(user_t *user, database_t *db)
{
private_auth_filter_t *this;
@@ -96,4 +96,3 @@ filter_t *auth_filter_create(user_t *user, database_t *db)
return &this->public.filter;
}
src/medsrv/filter/auth_filter.h
+3 -3
View File
@@ -23,7 +23,7 @@
#define AUTH_FILTER_H_
#include <library.h>
#include <filter.h>
#include <fast_filter.h>
#include "user.h"
@@ -37,12 +37,12 @@ struct auth_filter_t {
/**
* Implements filter_t interface.
*/
filter_t filter;
fast_filter_t filter;
};
/**
* Create a auth_filter instance.
*/
filter_t *auth_filter_create(user_t *user, database_t *db);
fast_filter_t *auth_filter_create(user_t *user, database_t *db);
#endif /** AUTH_FILTER_H_ @}*/
src/medsrv/main.c
+7 -8
View File
@@ -16,7 +16,7 @@
#include <stdio.h>
#include <dispatcher.h>
#include <fast_dispatcher.h>
#include <utils/debug.h>
#include <database/database.h>
@@ -26,7 +26,7 @@
int main(int arc, char *argv[])
{
dispatcher_t *dispatcher;
fast_dispatcher_t *dispatcher;
database_t *db;
char *socket;
bool debug;
@@ -58,14 +58,14 @@ int main(int arc, char *argv[])
return 1;
}
dispatcher = dispatcher_create(socket, debug, timeout,
(context_constructor_t)user_create, db);
dispatcher = fast_dispatcher_create(socket, debug, timeout,
(fast_context_constructor_t)user_create, db);
dispatcher->add_filter(dispatcher,
(filter_constructor_t)auth_filter_create, db);
(fast_filter_constructor_t)auth_filter_create, db);
dispatcher->add_controller(dispatcher,
(controller_constructor_t)user_controller_create, db);
(fast_controller_constructor_t)user_controller_create, db);
dispatcher->add_controller(dispatcher,
(controller_constructor_t)peer_controller_create, db);
(fast_controller_constructor_t)peer_controller_create, db);
dispatcher->run(dispatcher, threads);
@@ -76,4 +76,3 @@ int main(int arc, char *argv[])
library_deinit();
return 0;
}
src/medsrv/user.c
+1 -2
View File
@@ -45,7 +45,7 @@ METHOD(user_t, get_user, u_int,
return this->user;
}
METHOD(context_t, destroy, void,
METHOD(fast_context_t, destroy, void,
private_user_t *this)
{
free(this);
@@ -70,4 +70,3 @@ user_t *user_create(void *param)
return &this->public;
}
src/medsrv/user.h
+2 -2
View File
@@ -23,7 +23,7 @@
#ifndef USER_H_
#define USER_H_
#include <context.h>
#include <fast_context.h>
#include <library.h>
typedef struct user_t user_t;
@@ -36,7 +36,7 @@ struct user_t {
/**
* implements context_t interface
*/
context_t context;
fast_context_t context;
/**
* Set the user ID of the logged in user.