diff -r 2383ed4da507 -r 5bd10c0ae650 c++/domain-socket-bridge/domain-socket-bridge.cpp --- a/c++/domain-socket-bridge/domain-socket-bridge.cpp Sun Nov 20 20:40:30 2016 +0100 +++ b/c++/domain-socket-bridge/domain-socket-bridge.cpp Sun Nov 20 21:00:47 2016 +0100 @@ -17,10 +17,8 @@ using namespace std; -static const char MESSAGE[] = "Hello, World!\n"; - -static const char PATH[] = "./roura"; - +static const string HELLO_MESSAGE("Hello, World!\n"); +static const string SOCKET_PATH("./roura"); static const string COMMAND_EXIT("exit\n"); static void listener_cb(evutil_socket_t, short, void *); @@ -49,13 +47,13 @@ memset(&sun, 0, sizeof (sun)); sun.sun_family = AF_UNIX; - strcpy(sun.sun_path, PATH); + strcpy(sun.sun_path, SOCKET_PATH.c_str()); listener = socket(AF_UNIX, SOCK_STREAM, 0); evutil_make_socket_nonblocking(listener); if (bind(listener, (struct sockaddr*) &sun, sizeof (sun)) < 0) { - printf("%4s %8s %s: %s\n", "*", "ERROR", "unable to create domain socket:", PATH); + printf("%4s %8s %s: %s\n", "*", "ERROR", "unable to create domain socket:", SOCKET_PATH.c_str()); return 1; } @@ -91,7 +89,7 @@ // smažeme soket na disku / soubor -- jinak by program příště spadl na bind() // TODO: co když soket někdo přesune a místo něj dá jiný soubor? - unlink(PATH); + unlink(SOCKET_PATH.c_str()); printf("%4s %8s\n", "*", "FINISHED"); return 0; @@ -138,7 +136,7 @@ printf("%4d %8s somebody has connected: socketId = %d → connectionId = %d\n", *connectionId, "CONN", listener, *connectionId); print_socket_info(*connectionId, fd); - bufferevent_write(bev, MESSAGE, strlen(MESSAGE)); + bufferevent_write(bev, HELLO_MESSAGE.c_str(), strlen(HELLO_MESSAGE.c_str())); } static void conn_read_cb(struct bufferevent *bev, void *user_data) {