mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 08:08:12 +00:00
LibGUI: Make GSocket connection asynchronous.
Now connect() will return immediately. Later on, when the socket is actually connected, it will call GSocket::on_connected from the event loop. :^)
This commit is contained in:
parent
65d6318c33
commit
6d5a54690e
11 changed files with 65 additions and 29 deletions
|
@ -1,9 +1,12 @@
|
|||
#include <LibGUI/GSocket.h>
|
||||
#include <LibGUI/GNotifier.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
#include <errno.h>
|
||||
|
||||
GSocket::GSocket(Type type, GObject* parent)
|
||||
: GIODevice(parent)
|
||||
|
@ -41,17 +44,29 @@ bool GSocket::connect(const GSocketAddress& address, int port)
|
|||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(port);
|
||||
|
||||
m_destination_address = address;
|
||||
m_destination_port = port;
|
||||
|
||||
printf("Connecting to %s...", address.to_string().characters());
|
||||
fflush(stdout);
|
||||
int rc = ::connect(fd(), (struct sockaddr*)&addr, sizeof(addr));
|
||||
if (rc < 0) {
|
||||
if (errno == EINPROGRESS) {
|
||||
printf("in progress.\n");
|
||||
m_notifier = make<GNotifier>(fd(), GNotifier::Event::Write);
|
||||
m_notifier->on_ready_to_write = [this] (GNotifier&) {
|
||||
printf("%s{%p} connected!\n", class_name(), this);
|
||||
m_connected = true;
|
||||
m_notifier->set_event_mask(GNotifier::Event::None);
|
||||
if (on_connected)
|
||||
on_connected();
|
||||
};
|
||||
return true;
|
||||
}
|
||||
perror("connect");
|
||||
exit(1);
|
||||
}
|
||||
printf("ok!\n");
|
||||
|
||||
m_destination_address = address;
|
||||
m_destination_port = port;
|
||||
m_connected = true;
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue