wfreerdp-server: cleanup names
This commit is contained in:
Marc-André Moreau
parent
a43e5daebd
commit
209d44e843
@ -34,94 +34,37 @@
|
||||
HANDLE g_done_event;
|
||||
int g_thread_count = 0;
|
||||
|
||||
struct test_peer_context
|
||||
struct wf_peer_context
|
||||
{
|
||||
rdpContext _p;
|
||||
|
||||
STREAM* s;
|
||||
uint32 frame_id;
|
||||
boolean activated;
|
||||
RFX_CONTEXT* rfx_context;
|
||||
NSC_CONTEXT* nsc_context;
|
||||
freerdp_thread* debug_channel_thread;
|
||||
};
|
||||
typedef struct test_peer_context testPeerContext;
|
||||
typedef struct wf_peer_context wfPeerContext;
|
||||
|
||||
void test_peer_context_new(freerdp_peer* client, testPeerContext* context)
|
||||
void wf_peer_context_new(freerdp_peer* client, wfPeerContext* context)
|
||||
{
|
||||
context->rfx_context = rfx_context_new();
|
||||
context->rfx_context->mode = RLGR3;
|
||||
context->rfx_context->width = client->settings->width;
|
||||
context->rfx_context->height = client->settings->height;
|
||||
rfx_context_set_pixel_format(context->rfx_context, RDP_PIXEL_FORMAT_R8G8B8);
|
||||
|
||||
context->nsc_context = nsc_context_new();
|
||||
nsc_context_set_pixel_format(context->nsc_context, RDP_PIXEL_FORMAT_R8G8B8);
|
||||
|
||||
context->s = stream_new(65536);
|
||||
}
|
||||
|
||||
void test_peer_context_free(freerdp_peer* client, testPeerContext* context)
|
||||
void wf_peer_context_free(freerdp_peer* client, wfPeerContext* context)
|
||||
{
|
||||
if (context)
|
||||
{
|
||||
if (context->debug_channel_thread)
|
||||
{
|
||||
freerdp_thread_stop(context->debug_channel_thread);
|
||||
freerdp_thread_free(context->debug_channel_thread);
|
||||
}
|
||||
stream_free(context->s);
|
||||
|
||||
rfx_context_free(context->rfx_context);
|
||||
nsc_context_free(context->nsc_context);
|
||||
|
||||
xfree(context);
|
||||
}
|
||||
}
|
||||
|
||||
static void test_peer_init(freerdp_peer* client)
|
||||
static void wf_peer_init(freerdp_peer* client)
|
||||
{
|
||||
client->context_size = sizeof(testPeerContext);
|
||||
client->ContextNew = (psPeerContextNew) test_peer_context_new;
|
||||
client->ContextFree = (psPeerContextFree) test_peer_context_free;
|
||||
client->context_size = sizeof(wfPeerContext);
|
||||
client->ContextNew = (psPeerContextNew) wf_peer_context_new;
|
||||
client->ContextFree = (psPeerContextFree) wf_peer_context_free;
|
||||
freerdp_peer_context_new(client);
|
||||
}
|
||||
|
||||
static STREAM* test_peer_stream_init(testPeerContext* context)
|
||||
boolean wf_peer_post_connect(freerdp_peer* client)
|
||||
{
|
||||
stream_clear(context->s);
|
||||
stream_set_pos(context->s, 0);
|
||||
return context->s;
|
||||
}
|
||||
|
||||
static void test_peer_begin_frame(freerdp_peer* client)
|
||||
{
|
||||
rdpUpdate* update = client->update;
|
||||
SURFACE_FRAME_MARKER* fm = &update->surface_frame_marker;
|
||||
testPeerContext* context = (testPeerContext*) client->context;
|
||||
|
||||
fm->frameAction = SURFACECMD_FRAMEACTION_BEGIN;
|
||||
fm->frameId = context->frame_id;
|
||||
update->SurfaceFrameMarker(update->context, fm);
|
||||
}
|
||||
|
||||
static void test_peer_end_frame(freerdp_peer* client)
|
||||
{
|
||||
rdpUpdate* update = client->update;
|
||||
SURFACE_FRAME_MARKER* fm = &update->surface_frame_marker;
|
||||
testPeerContext* context = (testPeerContext*) client->context;
|
||||
|
||||
fm->frameAction = SURFACECMD_FRAMEACTION_END;
|
||||
fm->frameId = context->frame_id;
|
||||
update->SurfaceFrameMarker(update->context, fm);
|
||||
|
||||
context->frame_id++;
|
||||
}
|
||||
|
||||
boolean tf_peer_post_connect(freerdp_peer* client)
|
||||
{
|
||||
int i;
|
||||
testPeerContext* context = (testPeerContext*) client->context;
|
||||
wfPeerContext* context = (wfPeerContext*) client->context;
|
||||
|
||||
/**
|
||||
* This callback is called when the entire connection sequence is done, i.e. we've received the
|
||||
@ -148,40 +91,29 @@ boolean tf_peer_post_connect(freerdp_peer* client)
|
||||
|
||||
/* A real server should tag the peer as activated here and start sending updates in main loop. */
|
||||
|
||||
/* Iterate all channel names requested by the client and activate those supported by the server */
|
||||
|
||||
for (i = 0; i < client->settings->num_channels; i++)
|
||||
{
|
||||
if (client->settings->channels[i].joined)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/* Return false here would stop the execution of the peer mainloop. */
|
||||
return true;
|
||||
}
|
||||
|
||||
boolean tf_peer_activate(freerdp_peer* client)
|
||||
boolean wf_peer_activate(freerdp_peer* client)
|
||||
{
|
||||
testPeerContext* context = (testPeerContext*) client->context;
|
||||
wfPeerContext* context = (wfPeerContext*) client->context;
|
||||
|
||||
rfx_context_reset(context->rfx_context);
|
||||
context->activated = true;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void tf_peer_synchronize_event(rdpInput* input, uint32 flags)
|
||||
void wf_peer_synchronize_event(rdpInput* input, uint32 flags)
|
||||
{
|
||||
printf("Client sent a synchronize event (flags:0x%X)\n", flags);
|
||||
}
|
||||
|
||||
void tf_peer_keyboard_event(rdpInput* input, uint16 flags, uint16 code)
|
||||
void wf_peer_keyboard_event(rdpInput* input, uint16 flags, uint16 code)
|
||||
{
|
||||
freerdp_peer* client = input->context->peer;
|
||||
rdpUpdate* update = client->update;
|
||||
testPeerContext* context = (testPeerContext*) input->context;
|
||||
wfPeerContext* context = (wfPeerContext*) input->context;
|
||||
|
||||
printf("Client sent a keyboard event (flags:0x%X code:0x%X)\n", flags, code);
|
||||
|
||||
@ -206,49 +138,48 @@ void tf_peer_keyboard_event(rdpInput* input, uint16 flags, uint16 code)
|
||||
}
|
||||
}
|
||||
|
||||
void tf_peer_unicode_keyboard_event(rdpInput* input, uint16 flags, uint16 code)
|
||||
void wf_peer_unicode_keyboard_event(rdpInput* input, uint16 flags, uint16 code)
|
||||
{
|
||||
printf("Client sent a unicode keyboard event (flags:0x%X code:0x%X)\n", flags, code);
|
||||
}
|
||||
|
||||
void tf_peer_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y)
|
||||
void wf_peer_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y)
|
||||
{
|
||||
printf("Client sent a mouse event (flags:0x%X pos:%d,%d)\n", flags, x, y);
|
||||
}
|
||||
|
||||
void tf_peer_extended_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y)
|
||||
void wf_peer_extended_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y)
|
||||
{
|
||||
printf("Client sent an extended mouse event (flags:0x%X pos:%d,%d)\n", flags, x, y);
|
||||
}
|
||||
|
||||
static DWORD WINAPI test_peer_main_loop(LPVOID lpParam)
|
||||
static DWORD WINAPI wf_peer_main_loop(LPVOID lpParam)
|
||||
{
|
||||
int rcount;
|
||||
void* rfds[32];
|
||||
testPeerContext* context;
|
||||
wfPeerContext* context;
|
||||
freerdp_peer* client = (freerdp_peer*) lpParam;
|
||||
|
||||
memset(rfds, 0, sizeof(rfds));
|
||||
|
||||
test_peer_init(client);
|
||||
wf_peer_init(client);
|
||||
|
||||
/* Initialize the real server settings here */
|
||||
client->settings->cert_file = xstrdup("server.crt");
|
||||
client->settings->privatekey_file = xstrdup("server.key");
|
||||
client->settings->nla_security = false;
|
||||
client->settings->rfx_codec = true;
|
||||
client->settings->nla_security = true;
|
||||
|
||||
client->PostConnect = tf_peer_post_connect;
|
||||
client->Activate = tf_peer_activate;
|
||||
client->PostConnect = wf_peer_post_connect;
|
||||
client->Activate = wf_peer_activate;
|
||||
|
||||
client->input->SynchronizeEvent = tf_peer_synchronize_event;
|
||||
client->input->KeyboardEvent = tf_peer_keyboard_event;
|
||||
client->input->UnicodeKeyboardEvent = tf_peer_unicode_keyboard_event;
|
||||
client->input->MouseEvent = tf_peer_mouse_event;
|
||||
client->input->ExtendedMouseEvent = tf_peer_extended_mouse_event;
|
||||
client->input->SynchronizeEvent = wf_peer_synchronize_event;
|
||||
client->input->KeyboardEvent = wf_peer_keyboard_event;
|
||||
client->input->UnicodeKeyboardEvent = wf_peer_unicode_keyboard_event;
|
||||
client->input->MouseEvent = wf_peer_mouse_event;
|
||||
client->input->ExtendedMouseEvent = wf_peer_extended_mouse_event;
|
||||
|
||||
client->Initialize(client);
|
||||
context = (testPeerContext*) client->context;
|
||||
context = (wfPeerContext*) client->context;
|
||||
|
||||
printf("We've got a client %s\n", client->local ? "(local)" : client->hostname);
|
||||
|
||||
@ -278,11 +209,11 @@ static DWORD WINAPI test_peer_main_loop(LPVOID lpParam)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void test_peer_accepted(freerdp_listener* instance, freerdp_peer* client)
|
||||
static void wf_peer_accepted(freerdp_listener* instance, freerdp_peer* client)
|
||||
{
|
||||
/* start peer main loop thread */
|
||||
|
||||
if (CreateThread(NULL, 0, test_peer_main_loop, client, 0, NULL) != 0)
|
||||
if (CreateThread(NULL, 0, wf_peer_main_loop, client, 0, NULL) != 0)
|
||||
g_thread_count++;
|
||||
}
|
||||
|
||||
@ -313,19 +244,15 @@ static void test_server_main_loop(freerdp_listener* instance)
|
||||
instance->Close(instance);
|
||||
}
|
||||
|
||||
#define WFREERDP_SERVER_LOCAL_FILE "wfreerdp-server.0"
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
int port = 3389;
|
||||
char* temp_path;
|
||||
char* local_file;
|
||||
WSADATA wsa_data;
|
||||
freerdp_listener* instance;
|
||||
|
||||
instance = freerdp_listener_new();
|
||||
|
||||
instance->PeerAccepted = test_peer_accepted;
|
||||
instance->PeerAccepted = wf_peer_accepted;
|
||||
|
||||
if (WSAStartup(0x101, &wsa_data) != 0)
|
||||
return 1;
|
||||
@ -335,13 +262,9 @@ int main(int argc, char* argv[])
|
||||
if (argc == 2)
|
||||
port = atoi(argv[1]);
|
||||
|
||||
temp_path = getenv("TEMP");
|
||||
local_file = (char*) malloc(strlen(temp_path) + strlen(WFREERDP_SERVER_LOCAL_FILE) + 2);
|
||||
sprintf(local_file, "%s\\%s", temp_path, WFREERDP_SERVER_LOCAL_FILE);
|
||||
|
||||
/* Open the server socket and start listening. */
|
||||
|
||||
if (instance->Open(instance, NULL, port) && instance->OpenLocal(instance, local_file))
|
||||
if (instance->Open(instance, NULL, port))
|
||||
{
|
||||
/* Entering the server main loop. In a real server the listener can be run in its own thread. */
|
||||
test_server_main_loop(instance);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user