mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1826 from aquesnel/unify_logging_common

Browse Source 
Unify logging in common/* #1826
This commit is contained in:
matt335672 2021-03-15 10:41:22 +00:00 committed by GitHub
commit 89875d156a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 978 additions and 739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/arch.h
View File

@ -154,8 +154,8 @@ typedef int tsock;
#ifdef __cplusplus
extern "C" {
#endif
tintptr mod_init(void);
int mod_exit(tintptr);
tintptr mod_init(void);
int mod_exit(tintptr);
#ifdef __cplusplus
}
#endif

2
common/base64.c
View File

@ -67,7 +67,7 @@ base64_decode(char *dst, const char *src, size_t len)
bio = BIO_new_mem_buf(b64str, len);
bio = BIO_push(b64, bio);
BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL);
decoded_bytes = BIO_read(bio , dst, len);
decoded_bytes = BIO_read(bio, dst, len);
BIO_free_all(bio);
/* if input is corrupt, return empty string */

36
common/defines.h
View File

@ -21,12 +21,6 @@
#ifndef DEFINES_H
#define DEFINES_H
/* check for debug */
#ifdef XRDP_DEBUG
#define DEBUG(args) g_writeln args;
#else
#define DEBUG(args)
#endif
/* other macros */
#undef MIN
#define MIN(x1, x2) ((x1) < (x2) ? (x1) : (x2))
@ -42,25 +36,25 @@
/* graphics macros */
#define MAKERECT(r, x, y, cx, cy) \
{ (r).left = x; (r).top = y; (r).right = (x) + (cx); (r).bottom = (y) + (cy); }
{ (r).left = x; (r).top = y; (r).right = (x) + (cx); (r).bottom = (y) + (cy); }
#define ISRECTEMPTY(r) (((r).right <= (r).left) || ((r).bottom <= (r).top))
#define RECTOFFSET(r, dx, dy) \
{ (r).left += dx; (r).top += dy; (r).right += dx; (r).bottom += dy; }
{ (r).left += dx; (r).top += dy; (r).right += dx; (r).bottom += dy; }
#define GETPIXEL8(d, x, y, w) (*(((unsigned char*)d) + ((y) * (w) + (x))))
#define GETPIXEL16(d, x, y, w) (*(((unsigned short*)d) + ((y) * (w) + (x))))
#define GETPIXEL32(d, x, y, w) (*(((unsigned int*)d) + ((y) * (w) + (x))))
#define SETPIXEL8(d, x, y, w, v) \
(*(((unsigned char*)d) + ((y) * (w) + (x))) = (v))
(*(((unsigned char*)d) + ((y) * (w) + (x))) = (v))
#define SETPIXEL16(d, x, y, w, v) \
(*(((unsigned short*)d) + ((y) * (w) + (x))) = (v))
(*(((unsigned short*)d) + ((y) * (w) + (x))) = (v))
#define SETPIXEL32(d, x, y, w, v) \
(*(((unsigned int*)d) + ((y) * (w) + (x))) = (v))
(*(((unsigned int*)d) + ((y) * (w) + (x))) = (v))
#define COLOR8(r, g, b) \
( \
( \
(((r) >> 5) << 0) | \
(((g) >> 5) << 3) | \
(((b) >> 6) << 6) \
)
)
#define COLOR15(r, g, b) ((((r) >> 3) << 10) | (((g) >> 3) << 5) | ((b) >> 3))
#define COLOR16(r, g, b) ((((r) >> 3) << 11) | (((g) >> 2) << 5) | ((b) >> 3))
#define COLOR24RGB(r, g, b) (((r) << 16) | ((g) << 8) | (b))
@ -69,7 +63,7 @@
#define HGREEN(c) ((c & 0x00ff00) >> 8)
#define HBLUE(c) ((c & 0x0000ff))
#define HCOLOR(bpp,c) \
( \
( \
(bpp==8?COLOR8(HRED(c),HGREEN(c),HBLUE(c)): \
(bpp==15?COLOR15(HRED(c),HGREEN(c),HBLUE(c)): \
(bpp==16?COLOR16(HRED(c),HGREEN(c),HBLUE(c)): \
@ -77,25 +71,25 @@
) \
) \
) \
)
)
#define SPLITCOLOR15(r, g, b, c) \
{ \
{ \
r = (((c) >> 7) & 0xf8) | (((c) >> 12) & 0x7); \
g = (((c) >> 2) & 0xf8) | (((c) >> 8) & 0x7); \
b = (((c) << 3) & 0xf8) | (((c) >> 2) & 0x7); \
}
}
#define SPLITCOLOR16(r, g, b, c) \
{ \
{ \
r = (((c) >> 8) & 0xf8) | (((c) >> 13) & 0x7); \
g = (((c) >> 3) & 0xfc) | (((c) >> 9) & 0x3); \
b = (((c) << 3) & 0xf8) | (((c) >> 2) & 0x7); \
}
}
#define SPLITCOLOR32(r, g, b, c) \
{ \
{ \
r = ((c) >> 16) & 0xff; \
g = ((c) >> 8) & 0xff; \
b = (c) & 0xff; \
}
}
/* font macros */
#define FONT_DATASIZE(f) \
((((f)->height * (((f)->width + 7) / 8)) + 3) & ~3);

14
common/fifo.c
View File

@ -47,7 +47,9 @@ fifo_delete(FIFO *self)
USER_DATA *udp;
if (!self)
{
return;
}
if (!self->head)
{
@ -60,7 +62,9 @@ fifo_delete(FIFO *self)
{
/* only one item in FIFO */
if (self->auto_free)
{
g_free(self->head->item);
}
g_free(self->head);
g_free(self);
@ -73,7 +77,9 @@ fifo_delete(FIFO *self)
udp = self->head;
if (self->auto_free)
{
g_free(udp->item);
}
self->head = udp->next;
g_free(udp);
@ -97,10 +103,14 @@ fifo_add_item(FIFO *self, void *item)
USER_DATA *udp;
if (!self || !item)
{
return -1;
}
if ((udp = (USER_DATA *) g_malloc(sizeof(USER_DATA), 0)) == 0)
{
return -1;
}
udp->item = item;
udp->next = 0;
@ -135,7 +145,9 @@ fifo_remove_item(FIFO *self)
USER_DATA *udp;
if (!self || !self->head)
{
return 0;
}
if (self->head == self->tail)
{
@ -167,7 +179,9 @@ int
fifo_is_empty(FIFO *self)
{
if (!self)
{
return 1;
}
return (self->head == 0);
}

4
common/fifo.h
View File

@ -38,10 +38,10 @@ typedef struct fifo
int auto_free;
} FIFO;
FIFO * fifo_create(void);
FIFO *fifo_create(void);
void fifo_delete(FIFO *self);
int fifo_add_item(FIFO *self, void *item);
void * fifo_remove_item(FIFO *self);
void *fifo_remove_item(FIFO *self);
int fifo_is_empty(FIFO *self);
#endif

12
common/file.h
View File

@ -24,14 +24,14 @@
#include "arch.h"
int
file_read_sections(int fd, struct list* names);
file_read_sections(int fd, struct list *names);
int
file_by_name_read_sections(const char* file_name, struct list* names);
file_by_name_read_sections(const char *file_name, struct list *names);
int
file_read_section(int fd, const char* section,
struct list* names, struct list* values);
file_read_section(int fd, const char *section,
struct list *names, struct list *values);
int
file_by_name_read_section(const char* file_name, const char* section,
struct list* names, struct list* values);
file_by_name_read_section(const char *file_name, const char *section,
struct list *names, struct list *values);
#endif

5
common/list.c
View File

@ -26,6 +26,7 @@
#include "os_calls.h"
#include "string_calls.h"
#include "list.h"
#include "log.h"
/*****************************************************************************/
struct list *
@ -221,11 +222,11 @@ list_dump_items(struct list *self)
if (self->count == 0)
{
g_writeln("List is empty");
LOG_DEVEL(LOG_LEVEL_TRACE, "List is empty");
}
for (index = 0; index < self->count; index++)
{
g_writeln("%d: %p", index, (void *) list_get_item(self, index));
LOG_DEVEL(LOG_LEVEL_TRACE, "%d: %p", index, (void *) list_get_item(self, index));
}
}

20
common/list.h
View File

@ -26,32 +26,32 @@
/* list */
struct list
{
tintptr* items;
tintptr *items;
int count;
int alloc_size;
int grow_by;
int auto_free;
};
struct list*
struct list *
list_create(void);
void
list_delete(struct list* self);
list_delete(struct list *self);
void
list_add_item(struct list* self, tintptr item);
list_add_item(struct list *self, tintptr item);
tintptr
list_get_item(const struct list *self, int index);
void
list_clear(struct list* self);
list_clear(struct list *self);
int
list_index_of(struct list* self, tintptr item);
list_index_of(struct list *self, tintptr item);
void
list_remove_item(struct list* self, int index);
list_remove_item(struct list *self, int index);
void
list_insert_item(struct list* self, int index, tintptr item);
list_insert_item(struct list *self, int index, tintptr item);
void
list_append_list_strdup(struct list* self, struct list* dest, int start_index);
list_append_list_strdup(struct list *self, struct list *dest, int start_index);
void
list_dump_items(struct list* self);
list_dump_items(struct list *self);
#endif

4
common/list16.c
View File

@ -52,7 +52,7 @@ list16_delete(struct list16 *self)
/*****************************************************************************/
void
list16_init(struct list16* self)
list16_init(struct list16 *self)
{
g_memset(self, 0, sizeof(struct list16));
self->max_count = 4;
@ -61,7 +61,7 @@ list16_init(struct list16* self)
/*****************************************************************************/
void
list16_deinit(struct list16* self)
list16_deinit(struct list16 *self)
{
if (self->items != self->mitems)
{

22
common/list16.h
View File

@ -26,31 +26,31 @@
/* list */
struct list16
{
tui16* items;
tui16 *items;
int count;
int max_count;
tui16 mitems[4];
};
struct list16*
struct list16 *
list16_create(void);
void
list16_delete(struct list16* self);
list16_delete(struct list16 *self);
void
list16_init(struct list16* self);
list16_init(struct list16 *self);
void
list16_deinit(struct list16* self);
list16_deinit(struct list16 *self);
void
list16_add_item(struct list16* self, tui16 item);
list16_add_item(struct list16 *self, tui16 item);
tui16
list16_get_item(struct list16* self, int index);
list16_get_item(struct list16 *self, int index);
void
list16_clear(struct list16* self);
list16_clear(struct list16 *self);
int
list16_index_of(struct list16* self, tui16 item);
list16_index_of(struct list16 *self, tui16 item);
void
list16_remove_item(struct list16* self, int index);
list16_remove_item(struct list16 *self, int index);
void
list16_insert_item(struct list16* self, int index, tui16 item);
list16_insert_item(struct list16 *self, int index, tui16 item);
#endif

22
common/ms-rdpbcgr.h
View File

@ -282,16 +282,16 @@
#define TS_NEG_SCRBLT_INDEX 0x02
#define TS_NEG_MEMBLT_INDEX 0x03
#define TS_NEG_MEM3BLT_INDEX 0x04
/* 0x05 */
/* 0x06 */
/* 0x05 */
/* 0x06 */
#define TS_NEG_DRAWNINEGRID_INDEX 0x07
#define TS_NEG_LINETO_INDEX 0x08
#define TS_NEG_MULTI_DRAWNINEGRID_INDEX 0x09
/* 0x0A */
/* 0x0A */
#define TS_NEG_SAVEBITMAP_INDEX 0x0B
/* 0x0C */
/* 0x0D */
/* 0x0E */
/* 0x0C */
/* 0x0D */
/* 0x0E */
#define TS_NEG_MULTIDSTBLT_INDEX 0x0F
#define TS_NEG_MULTIPATBLT_INDEX 0x10
#define TS_NEG_MULTISCRBLT_INDEX 0x11
@ -300,15 +300,15 @@
#define TS_NEG_POLYGON_SC_INDEX 0x14
#define TS_NEG_POLYGON_CB_INDEX 0x15
#define TS_NEG_POLYLINE_INDEX 0x16
/* 0x17 */
/* 0x17 */
#define TS_NEG_FAST_GLYPH_INDEX 0x18
#define TS_NEG_ELLIPSE_SC_INDEX 0x19
#define TS_NEG_ELLIPSE_CB_INDEX 0x1A
#define TS_NEG_INDEX_INDEX 0x1B
/* 0x1C */
/* 0x1D */
/* 0x1E */
/* 0x1F */
/* 0x1C */
/* 0x1D */
/* 0x1E */
/* 0x1F */
/* Input Capability Set: inputFlags (2.2.7.1.6) */
#define INPUT_FLAG_SCANCODES 0x0001

133
common/os_calls.c
View File

@ -121,7 +121,7 @@ g_mk_socket_path(const char *app_name)
/* if failed, still check if it got created by someone else */
if (!g_directory_exist(XRDP_SOCKET_PATH))
{
log_message(LOG_LEVEL_ERROR,
LOG(LOG_LEVEL_ERROR,
"g_mk_socket_path: g_create_path(%s) failed",
XRDP_SOCKET_PATH);
return 1;
@ -269,7 +269,7 @@ g_write(const char *format, ...)
}
/*****************************************************************************/
/* produce a hex dump */
/* print a hex dump to stdout*/
void
g_hexdump(const char *p, int len)
{
@ -360,13 +360,13 @@ g_tcp_set_no_delay(int sck)
}
else
{
g_writeln("Error setting tcp_nodelay");
LOG(LOG_LEVEL_ERROR, "Error setting tcp_nodelay");
}
}
}
else
{
g_writeln("Error getting tcp_nodelay");
LOG(LOG_LEVEL_ERROR, "Error getting tcp_nodelay");
}
return ret;
@ -399,13 +399,13 @@ g_tcp_set_keepalive(int sck)
}
else
{
g_writeln("Error setting tcp_keepalive");
LOG(LOG_LEVEL_ERROR, "Error setting tcp_keepalive");
}
}
}
else
{
g_writeln("Error getting tcp_keepalive");
LOG(LOG_LEVEL_ERROR, "Error getting tcp_keepalive");
}
return ret;
@ -428,12 +428,12 @@ g_tcp_socket(void)
switch (errno)
{
case EAFNOSUPPORT: /* if IPv6 not supported, retry IPv4 */
log_message(LOG_LEVEL_INFO, "IPv6 not supported, falling back to IPv4");
LOG(LOG_LEVEL_INFO, "IPv6 not supported, falling back to IPv4");
rv = (int)socket(AF_INET, SOCK_STREAM, 0);
break;
default:
log_message(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
LOG(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
return -1;
}
}
@ -442,12 +442,12 @@ g_tcp_socket(void)
#endif
if (rv < 0)
{
log_message(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
LOG(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
return -1;
}
#if defined(XRDP_ENABLE_IPV6)
option_len = sizeof(option_value);
if (getsockopt(rv, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&option_value,
if (getsockopt(rv, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&option_value,
&option_len) == 0)
{
if (option_value != 0)
@ -458,10 +458,10 @@ g_tcp_socket(void)
option_value = 0;
#endif
option_len = sizeof(option_value);
if (setsockopt(rv, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&option_value,
if (setsockopt(rv, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&option_value,
option_len) < 0)
{
log_message(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
LOG(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
}
}
}
@ -477,7 +477,7 @@ g_tcp_socket(void)
if (setsockopt(rv, SOL_SOCKET, SO_REUSEADDR, (char *)&option_value,
option_len) < 0)
{
log_message(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
LOG(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
}
}
}
@ -494,7 +494,7 @@ g_tcp_socket(void)
if (setsockopt(rv, SOL_SOCKET, SO_SNDBUF, (char *)&option_value,
option_len) < 0)
{
log_message(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
LOG(LOG_LEVEL_ERROR, "g_tcp_socket: setsockopt() failed");
}
}
}
@ -640,7 +640,7 @@ g_sck_get_peer_cred(int sck, int *pid, int *uid, int *gid)
{
return 1;
}
if (pid !=0)
if (pid != 0)
{
*pid = 0; /* can't get pid in FreeBSD, OS X */
}
@ -648,7 +648,8 @@ g_sck_get_peer_cred(int sck, int *pid, int *uid, int *gid)
{
*uid = xucred.cr_uid;
}
if (gid != 0) {
if (gid != 0)
{
*gid = xucred.cr_gid;
}
return 0;
@ -738,7 +739,7 @@ g_sck_close(int sck)
}
else
{
log_message(LOG_LEVEL_WARNING, "getsockname() failed on socket %d: %s",
LOG(LOG_LEVEL_WARNING, "getsockname() failed on socket %d: %s",
sck, g_get_strerror());
if (errno == EBADF || errno == ENOTSOCK)
@ -751,11 +752,11 @@ g_sck_close(int sck)
if (close(sck) == 0)
{
log_message(LOG_LEVEL_DEBUG, "Closed socket %d (%s)", sck, sockname);
LOG(LOG_LEVEL_DEBUG, "Closed socket %d (%s)", sck, sockname);
}
else
{
log_message(LOG_LEVEL_WARNING, "Cannot close socket %d (%s): %s", sck,
LOG(LOG_LEVEL_WARNING, "Cannot close socket %d (%s): %s", sck,
sockname, g_get_strerror());
}
@ -777,7 +778,7 @@ connect_loopback(int sck, const char *port)
sa.sin6_family = AF_INET6;
sa.sin6_addr = in6addr_loopback; // IPv6 ::1
sa.sin6_port = htons((tui16)atoi(port));
res = connect(sck, (struct sockaddr*)&sa, sizeof(sa));
res = connect(sck, (struct sockaddr *)&sa, sizeof(sa));
if (res == -1 && errno == EINPROGRESS)
{
return -1;
@ -792,7 +793,7 @@ connect_loopback(int sck, const char *port)
s.sin_family = AF_INET;
s.sin_addr.s_addr = htonl(INADDR_LOOPBACK); // IPv4 127.0.0.1
s.sin_port = htons((tui16)atoi(port));
res = connect(sck, (struct sockaddr*)&s, sizeof(s));
res = connect(sck, (struct sockaddr *)&s, sizeof(s));
if (res == -1 && errno == EINPROGRESS)
{
return -1;
@ -807,7 +808,7 @@ connect_loopback(int sck, const char *port)
sa.sin6_family = AF_INET6;
inet_pton(AF_INET6, "::FFFF:127.0.0.1", &sa.sin6_addr);
sa.sin6_port = htons((tui16)atoi(port));
res = connect(sck, (struct sockaddr*)&sa, sizeof(sa));
res = connect(sck, (struct sockaddr *)&sa, sizeof(sa));
if (res == -1 && errno == EINPROGRESS)
{
return -1;
@ -850,7 +851,7 @@ g_tcp_connect(int sck, const char *address, const char *port)
}
if (res != 0)
{
log_message(LOG_LEVEL_ERROR, "g_tcp_connect(%d, %s, %s): getaddrinfo() failed: %s",
LOG(LOG_LEVEL_ERROR, "g_tcp_connect(%d, %s, %s): getaddrinfo() failed: %s",
sck, address, port, gai_strerror(res));
}
if (res > -1)
@ -879,10 +880,10 @@ g_tcp_connect(int sck, const char *address, const char *port)
}
#else
int
g_tcp_connect(int sck, const char* address, const char* port)
g_tcp_connect(int sck, const char *address, const char *port)
{
struct sockaddr_in s;
struct hostent* h;
struct hostent *h;
int res;
g_memset(&s, 0, sizeof(struct sockaddr_in));
@ -900,13 +901,13 @@ g_tcp_connect(int sck, const char* address, const char* port)
{
if ((*(h->h_addr_list)) != 0)
{
s.sin_addr.s_addr = *((int*)(*(h->h_addr_list)));
s.sin_addr.s_addr = *((int *)(*(h->h_addr_list)));
}
}
}
}
}
res = connect(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
res = connect(sck, (struct sockaddr *)&s, sizeof(struct sockaddr_in));
/* Mac OSX connect() returns -1 for already established connections */
if (res == -1 && errno == EISCONN)
@ -951,7 +952,7 @@ g_sck_set_non_blocking(int sck)
i = i | O_NONBLOCK;
if (fcntl(sck, F_SETFL, i) < 0)
{
log_message(LOG_LEVEL_ERROR, "g_sck_set_non_blocking: fcntl() failed");
LOG(LOG_LEVEL_ERROR, "g_sck_set_non_blocking: fcntl() failed");
}
#endif
return 0;
@ -972,7 +973,7 @@ g_tcp_bind(int sck, const char *port)
sa.sin6_family = AF_INET6;
sa.sin6_addr = in6addr_any; // IPv6 ::
sa.sin6_port = htons((tui16)atoi(port));
if (bind(sck, (struct sockaddr*)&sa, sizeof(sa)) == 0)
if (bind(sck, (struct sockaddr *)&sa, sizeof(sa)) == 0)
{
return 0;
}
@ -983,19 +984,19 @@ g_tcp_bind(int sck, const char *port)
s.sin_family = AF_INET;
s.sin_addr.s_addr = htonl(INADDR_ANY); // IPv4 0.0.0.0
s.sin_port = htons((tui16)atoi(port));
if (bind(sck, (struct sockaddr*)&s, sizeof(s)) == 0)
if (bind(sck, (struct sockaddr *)&s, sizeof(s)) == 0)
{
return 0;
}
log_message(LOG_LEVEL_ERROR, "g_tcp_bind(%d, %s) failed "
LOG(LOG_LEVEL_ERROR, "g_tcp_bind(%d, %s) failed "
"bind IPv6 (errno=%d) and IPv4 (errno=%d).",
sck, port, errno6, errno);
return -1;
}
#else
int
g_tcp_bind(int sck, const char* port)
g_tcp_bind(int sck, const char *port)
{
struct sockaddr_in s;
@ -1003,7 +1004,7 @@ g_tcp_bind(int sck, const char* port)
s.sin_family = AF_INET;
s.sin_port = htons((tui16)atoi(port));
s.sin_addr.s_addr = INADDR_ANY;
return bind(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
return bind(sck, (struct sockaddr *)&s, sizeof(struct sockaddr_in));
}
#endif
@ -1078,7 +1079,7 @@ bind_loopback(int sck, const char *port)
sa.sin6_family = AF_INET6;
sa.sin6_addr = in6addr_loopback; // IPv6 ::1
sa.sin6_port = htons((tui16)atoi(port));
if (bind(sck, (struct sockaddr*)&sa, sizeof(sa)) == 0)
if (bind(sck, (struct sockaddr *)&sa, sizeof(sa)) == 0)
{
return 0;
}
@ -1089,7 +1090,7 @@ bind_loopback(int sck, const char *port)
s.sin_family = AF_INET;
s.sin_addr.s_addr = htonl(INADDR_LOOPBACK); // IPv4 127.0.0.1
s.sin_port = htons((tui16)atoi(port));
if (bind(sck, (struct sockaddr*)&s, sizeof(s)) == 0)
if (bind(sck, (struct sockaddr *)&s, sizeof(s)) == 0)
{
return 0;
}
@ -1100,12 +1101,12 @@ bind_loopback(int sck, const char *port)
sa.sin6_family = AF_INET6;
inet_pton(AF_INET6, "::FFFF:127.0.0.1", &sa.sin6_addr);
sa.sin6_port = htons((tui16)atoi(port));
if (bind(sck, (struct sockaddr*)&sa, sizeof(sa)) == 0)
if (bind(sck, (struct sockaddr *)&sa, sizeof(sa)) == 0)
{
return 0;
}
log_message(LOG_LEVEL_ERROR, "bind_loopback(%d, %s) failed; "
LOG(LOG_LEVEL_ERROR, "bind_loopback(%d, %s) failed; "
"IPv6 ::1 (errno=%d), IPv4 127.0.0.1 (errno=%d) and IPv6 ::FFFF:127.0.0.1 (errno=%d).",
sck, port, errno6, errno4, errno);
return -1;
@ -1142,7 +1143,7 @@ getaddrinfo_bind(int sck, const char *port, const char *address)
}
else
{
log_message(LOG_LEVEL_ERROR, "getaddrinfo error: %s", gai_strerror(error));
LOG(LOG_LEVEL_ERROR, "getaddrinfo error: %s", gai_strerror(error));
return -1;
}
return res;
@ -1183,7 +1184,7 @@ g_tcp_bind_address(int sck, const char *port, const char *address)
struct in_addr a;
if ((inet_aton(address, &a) == 1) && (strlen(address) <= 15))
{
char sz[7+15+1];
char sz[7 + 15 + 1];
sprintf(sz, "::FFFF:%s", address);
res = getaddrinfo_bind(sck, port, sz);
if (res == 0)
@ -1192,7 +1193,7 @@ g_tcp_bind_address(int sck, const char *port, const char *address)
}
}
log_message(LOG_LEVEL_ERROR, "g_tcp_bind_address(%d, %s, %s) Failed!",
LOG(LOG_LEVEL_ERROR, "g_tcp_bind_address(%d, %s, %s) Failed!",
sck, port, address);
return -1;
}
@ -1200,7 +1201,7 @@ g_tcp_bind_address(int sck, const char *port, const char *address)
}
#else
int
g_tcp_bind_address(int sck, const char* port, const char* address)
g_tcp_bind_address(int sck, const char *port, const char *address)
{
struct sockaddr_in s;
@ -1212,7 +1213,7 @@ g_tcp_bind_address(int sck, const char* port, const char* address)
{
return -1; /* bad address */
}
return bind(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
return bind(sck, (struct sockaddr *)&s, sizeof(struct sockaddr_in));
}
#endif
@ -1246,7 +1247,7 @@ g_tcp_accept(int sck)
if (ret > 0)
{
switch(sock_info.sock_addr.sa_family)
switch (sock_info.sock_addr.sa_family)
{
case AF_INET:
{
@ -1255,7 +1256,7 @@ g_tcp_accept(int sck)
g_snprintf(msg, sizeof(msg), "A connection received from %s port %d",
inet_ntoa(sock_addr_in->sin_addr),
ntohs(sock_addr_in->sin_port));
log_message(LOG_LEVEL_INFO, "%s", msg);
LOG(LOG_LEVEL_INFO, "%s", msg);
break;
}
@ -1271,7 +1272,7 @@ g_tcp_accept(int sck)
&sock_addr_in6->sin6_addr, addr, sizeof(addr));
g_snprintf(msg, sizeof(msg), "A connection received from %s port %d",
addr, ntohs(sock_addr_in6->sin6_port));
log_message(LOG_LEVEL_INFO, "%s", msg);
LOG(LOG_LEVEL_INFO, "%s", msg);
break;
@ -1310,7 +1311,7 @@ g_sck_accept(int sck, char *addr, int addr_bytes, char *port, int port_bytes)
if (ret > 0)
{
switch(sock_info.sock_addr.sa_family)
switch (sock_info.sock_addr.sa_family)
{
case AF_INET:
{
@ -1380,7 +1381,7 @@ g_sck_accept(int sck, char *addr, int addr_bytes, char *port, int port_bytes)
}
log_message(LOG_LEVEL_INFO, "Socket %d: %s", ret, msg);
LOG(LOG_LEVEL_INFO, "Socket %d: %s", ret, msg);
}
@ -1419,7 +1420,7 @@ g_write_ip_address(int rcv_sck, char *ip_address, int bytes)
if (getpeername(rcv_sck, (struct sockaddr *)&sock_info, &sock_len) == 0)
{
switch(sock_info.sock_addr.sa_family)
switch (sock_info.sock_addr.sa_family)
{
case AF_INET:
{
@ -2008,7 +2009,7 @@ g_obj_wait(tintptr *read_objs, int rcount, tintptr *write_objs, int wcount,
}
else if (rcount > 0)
{
g_writeln("Programming error read_objs is null");
LOG(LOG_LEVEL_ERROR, "Programming error read_objs is null");
return 1; /* error */
}
@ -2031,7 +2032,7 @@ g_obj_wait(tintptr *read_objs, int rcount, tintptr *write_objs, int wcount,
}
else if (wcount > 0)
{
g_writeln("Programming error write_objs is null");
LOG(LOG_LEVEL_ERROR, "Programming error write_objs is null");
return 1; /* error */
}
@ -3135,11 +3136,11 @@ struct dib_hdr
int vres;
unsigned int ncolors;
unsigned int nimpcolors;
};
};
/******************************************************************************/
int
g_save_to_bmp(const char* filename, char* data, int stride_bytes,
g_save_to_bmp(const char *filename, char *data, int stride_bytes,
int width, int height, int depth, int bits_per_pixel)
{
struct bmp_magic bm;
@ -3152,8 +3153,8 @@ g_save_to_bmp(const char* filename, char* data, int stride_bytes,
int pixel;
int extra;
int file_stride_bytes;
char* line;
char* line_ptr;
char *line;
char *line_ptr;
if ((depth == 24) && (bits_per_pixel == 32))
{
@ -3163,7 +3164,9 @@ g_save_to_bmp(const char* filename, char* data, int stride_bytes,
}
else
{
g_writeln("g_save_to_bpp: unimp");
LOG(LOG_LEVEL_ERROR,
"g_save_to_bpp: unimplemented for: depth %d, bits_per_pixel %d",
depth, bits_per_pixel);
return 1;
}
bm.magic[0] = 'B';
@ -3196,23 +3199,23 @@ g_save_to_bmp(const char* filename, char* data, int stride_bytes,
fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
if (fd == -1)
{
g_writeln("g_save_to_bpp: open error");
LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: open error");
return 1;
}
bytes = write(fd, &bm, sizeof(bm));
if (bytes != sizeof(bm))
{
g_writeln("g_save_to_bpp: write error");
LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
}
bytes = write(fd, &bh, sizeof(bh));
if (bytes != sizeof(bh))
{
g_writeln("g_save_to_bpp: write error");
LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
}
bytes = write(fd, &dh, sizeof(dh));
if (bytes != sizeof(dh))
{
g_writeln("g_save_to_bpp: write error");
LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
}
data += stride_bytes * height;
data -= stride_bytes;
@ -3225,7 +3228,7 @@ g_save_to_bmp(const char* filename, char* data, int stride_bytes,
line_ptr = line;
for (i1 = 0; i1 < width; i1++)
{
pixel = ((int*)data)[i1];
pixel = ((int *)data)[i1];
*(line_ptr++) = (pixel >> 0) & 0xff;
*(line_ptr++) = (pixel >> 8) & 0xff;
*(line_ptr++) = (pixel >> 16) & 0xff;
@ -3233,7 +3236,7 @@ g_save_to_bmp(const char* filename, char* data, int stride_bytes,
bytes = write(fd, line, file_stride_bytes);
if (bytes != file_stride_bytes)
{
g_writeln("g_save_to_bpp: write error");
LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
}
data -= stride_bytes;
}
@ -3246,14 +3249,16 @@ g_save_to_bmp(const char* filename, char* data, int stride_bytes,
bytes = write(fd, data, width * (bits_per_pixel / 8));
if (bytes != width * (bits_per_pixel / 8))
{
g_writeln("g_save_to_bpp: write error");
LOG(LOG_LEVEL_ERROR, "g_save_to_bpp: write error");
}
data -= stride_bytes;
}
}
else
{
g_writeln("g_save_to_bpp: unimp");
LOG(LOG_LEVEL_ERROR,
"g_save_to_bpp: unimplemented for: depth %d, bits_per_pixel %d",
depth, bits_per_pixel);
}
close(fd);
return 0;
@ -3398,7 +3403,7 @@ g_tcp4_bind_address(int sck, const char *port, const char *address)
{
return -1; /* bad address */
}
if (bind(sck, (struct sockaddr*) &s, sizeof(s)) < 0)
if (bind(sck, (struct sockaddr *) &s, sizeof(s)) < 0)
{
return -1;
}

104
common/os_calls.h
View File

@ -38,21 +38,21 @@
#define g_close_wait_obj g_delete_wait_obj
int g_rm_temp_dir(void);
int g_mk_socket_path(const char* app_name);
void g_init(const char* app_name);
int g_mk_socket_path(const char *app_name);
void g_init(const char *app_name);
void g_deinit(void);
void* g_malloc(int size, int zero);
void g_free(void* ptr);
void *g_malloc(int size, int zero);
void g_free(void *ptr);
void g_printf(const char *format, ...) printflike(1, 2);
void g_sprintf(char* dest, const char* format, ...) \
printflike(2, 3);
int g_snprintf(char* dest, int len, const char* format, ...) \
printflike(3, 4);
void g_writeln(const char* format, ...) printflike(1, 2);
void g_write(const char* format, ...) printflike(1, 2);
void g_sprintf(char *dest, const char *format, ...) \
printflike(2, 3);
int g_snprintf(char *dest, int len, const char *format, ...) \
printflike(3, 4);
void g_writeln(const char *format, ...) printflike(1, 2);
void g_write(const char *format, ...) printflike(1, 2);
void g_hexdump(const char *p, int len);
void g_memset(void* ptr, int val, int size);
void g_memcpy(void* d_ptr, const void* s_ptr, int size);
void g_memset(void *ptr, int val, int size);
void g_memcpy(void *d_ptr, const void *s_ptr, int size);
int g_getchar(void);
int g_tcp_set_no_delay(int sck);
int g_tcp_set_keepalive(int sck);
@ -65,26 +65,26 @@ int g_sck_local_socket(void);
int g_sck_vsock_socket(void);
int g_sck_get_peer_cred(int sck, int *pid, int *uid, int *gid);
void g_sck_close(int sck);
int g_tcp_connect(int sck, const char* address, const char* port);
int g_sck_local_connect(int sck, const char* port);
int g_tcp_connect(int sck, const char *address, const char *port);
int g_sck_local_connect(int sck, const char *port);
int g_sck_set_non_blocking(int sck);
int g_tcp_bind(int sck, const char *port);
int g_sck_local_bind(int sck, const char* port);
int g_sck_vsock_bind(int sck, const char* port);
int g_sck_local_bind(int sck, const char *port);
int g_sck_vsock_bind(int sck, const char *port);
int g_sck_vsock_bind_address(int sck, const char *port, const char *address);
int g_tcp_bind_address(int sck, const char* port, const char* address);
int g_tcp_bind_address(int sck, const char *port, const char *address);
int g_sck_listen(int sck);
int g_tcp_accept(int sck);
int g_sck_accept(int sck, char *addr, int addr_bytes,
char *port, int port_bytes);
int g_sck_recv(int sck, void* ptr, int len, int flags);
int g_sck_send(int sck, const void* ptr, int len, int flags);
int g_sck_recv(int sck, void *ptr, int len, int flags);
int g_sck_send(int sck, const void *ptr, int len, int flags);
int g_sck_last_error_would_block(int sck);
int g_sck_socket_ok(int sck);
int g_sck_can_send(int sck, int millis);
int g_sck_can_recv(int sck, int millis);
int g_sck_select(int sck1, int sck2);
void g_write_ip_address(int rcv_sck, char* ip_address, int bytes);
void g_write_ip_address(int rcv_sck, char *ip_address, int bytes);
void g_sleep(int msecs);
tintptr g_create_wait_obj(const char *name);
tintptr g_create_wait_obj_from_socket(tintptr socket, int write);
@ -93,40 +93,40 @@ int g_set_wait_obj(tintptr obj);
int g_reset_wait_obj(tintptr obj);
int g_is_wait_obj_set(tintptr obj);
int g_delete_wait_obj(tintptr obj);
int g_obj_wait(tintptr* read_objs, int rcount, tintptr* write_objs,
int wcount,int mstimeout);
void g_random(char* data, int len);
int g_obj_wait(tintptr *read_objs, int rcount, tintptr *write_objs,
int wcount, int mstimeout);
void g_random(char *data, int len);
int g_abs(int i);
int g_memcmp(const void* s1, const void* s2, int len);
int g_file_open(const char* file_name);
int g_memcmp(const void *s1, const void *s2, int len);
int g_file_open(const char *file_name);
int g_file_open_ex(const char *file_name, int aread, int awrite,
int acreate, int atrunc);
int g_file_close(int fd);
int g_file_read(int fd, char* ptr, int len);
int g_file_read(int fd, char *ptr, int len);
int g_file_write(int fd, const char *ptr, int len);
int g_file_seek(int fd, int offset);
int g_file_lock(int fd, int start, int len);
int g_chmod_hex(const char* filename, int flags);
int g_chown(const char* name, int uid, int gid);
int g_mkdir(const char* dirname);
char* g_get_current_dir(char* dirname, int maxlen);
int g_chmod_hex(const char *filename, int flags);
int g_chown(const char *name, int uid, int gid);
int g_mkdir(const char *dirname);
char *g_get_current_dir(char *dirname, int maxlen);
int g_set_current_dir(const char *dirname);
int g_file_exist(const char* filename);
int g_file_exist(const char *filename);
int g_file_readable(const char *filename);
int g_directory_exist(const char* dirname);
int g_create_dir(const char* dirname);
int g_create_path(const char* path);
int g_remove_dir(const char* dirname);
int g_file_delete(const char* filename);
int g_file_get_size(const char* filename);
long g_load_library(char* in);
int g_directory_exist(const char *dirname);
int g_create_dir(const char *dirname);
int g_create_path(const char *path);
int g_remove_dir(const char *dirname);
int g_file_delete(const char *filename);
int g_file_get_size(const char *filename);
long g_load_library(char *in);
int g_free_library(long lib);
void* g_get_proc_address(long lib, const char* name);
int g_system(char* aexec);
char* g_get_strerror(void);
void *g_get_proc_address(long lib, const char *name);
int g_system(char *aexec);
char *g_get_strerror(void);
int g_get_errno(void);
int g_execvp(const char* p1, char* args[]);
int g_execlp3(const char* a1, const char* a2, const char* a3);
int g_execvp(const char *p1, char *args[]);
int g_execlp3(const char *a1, const char *a2, const char *a3);
void g_signal_child_stop(void (*func)(int));
void g_signal_segfault(void (*func)(int));
void g_signal_hang_up(void (*func)(int));
@ -136,7 +136,7 @@ void g_signal_pipe(void (*func)(int));
void g_signal_usr1(void (*func)(int));
int g_fork(void);
int g_setgid(int pid);
int g_initgroups(const char* user, int gid);
int g_initgroups(const char *user, int gid);
int g_getuid(void);
int g_getgid(void);
int g_setuid(int pid);
@ -146,21 +146,21 @@ int g_setlogin(const char *name);
int g_waitchild(void);
int g_waitpid(int pid);
void g_clearenv(void);
int g_setenv(const char* name, const char* value, int rewrite);
char* g_getenv(const char* name);
int g_setenv(const char *name, const char *value, int rewrite);
char *g_getenv(const char *name);
int g_exit(int exit_code);
int g_getpid(void);
int g_sigterm(int pid);
int g_getuser_info(const char* username, int* gid, int* uid, char** shell,
char** dir, char** gecos);
int g_getgroup_info(const char* groupname, int* gid);
int g_check_user_in_group(const char* username, int gid, int* ok);
int g_getuser_info(const char *username, int *gid, int *uid, char **shell,
char **dir, char **gecos);
int g_getgroup_info(const char *groupname, int *gid);
int g_check_user_in_group(const char *username, int gid, int *ok);
int g_time1(void);
int g_time2(void);
int g_time3(void);
int g_save_to_bmp(const char* filename, char* data, int stride_bytes,
int g_save_to_bmp(const char *filename, char *data, int stride_bytes,
int width, int height, int depth, int bits_per_pixel);
void * g_shmat(int shmid);
void *g_shmat(int shmid);
int g_shmdt(const void *shmaddr);
int g_gethostname(char *name, int len);
int g_mirror_memcpy(void *dst, const void *src, int len);

154
common/parse.h
View File

@ -118,7 +118,7 @@ struct stream
/******************************************************************************/
#define init_stream(s, v) do \
{ \
{ \
if ((v) > (s)->size) \
{ \
g_free((s)->data); \
@ -128,24 +128,24 @@ struct stream
(s)->p = (s)->data; \
(s)->end = (s)->data; \
(s)->next_packet = 0; \
} while (0)
} while (0)
/******************************************************************************/
#define free_stream(s) do \
{ \
{ \
if ((s) != 0) \
{ \
g_free((s)->data); \
} \
g_free((s)); \
} while (0)
} while (0)
/******************************************************************************/
#define s_push_layer(s, h, n) do \
{ \
{ \
(s)->h = (s)->p; \
(s)->p += (n); \
} while (0)
} while (0)
/******************************************************************************/
#define s_pop_layer(s, h) \
@ -156,71 +156,71 @@ struct stream
(s)->end = (s)->p
#define in_sint8(s, v) do \
{ \
{ \
(v) = *((signed char*)((s)->p)); \
(s)->p++; \
} while (0)
} while (0)
/******************************************************************************/
#define in_uint8(s, v) do \
{ \
{ \
(v) = *((unsigned char*)((s)->p)); \
(s)->p++; \
} while (0)
} while (0)
/******************************************************************************/
#define in_uint8_peek(s, v) do { v = *s->p; } while (0)
/******************************************************************************/
#if defined(B_ENDIAN) || defined(NEED_ALIGN)
#define in_sint16_le(s, v) do \
{ \
{ \
(v) = (signed short) \
( \
(*((unsigned char*)((s)->p + 0)) << 0) | \
(*((unsigned char*)((s)->p + 1)) << 8) \
); \
(s)->p += 2; \
} while (0)
} while (0)
#else
#define in_sint16_le(s, v) do \
{ \
{ \
(v) = *((signed short*)((s)->p)); \
(s)->p += 2; \
} while (0)
} while (0)
#endif
/******************************************************************************/
#if defined(B_ENDIAN) || defined(NEED_ALIGN)
#define in_uint16_le(s, v) do \
{ \
{ \
(v) = (unsigned short) \
( \
(*((unsigned char*)((s)->p + 0)) << 0) | \
(*((unsigned char*)((s)->p + 1)) << 8) \
); \
(s)->p += 2; \
} while (0)
} while (0)
#else
#define in_uint16_le(s, v) do \
{ \
{ \
(v) = *((unsigned short*)((s)->p)); \
(s)->p += 2; \
} while (0)
} while (0)
#endif
/******************************************************************************/
#define in_uint16_be(s, v) do \
{ \
{ \
(v) = *((unsigned char*)((s)->p)); \
(s)->p++; \
(v) <<= 8; \
(v) |= *((unsigned char*)((s)->p)); \
(s)->p++; \
} while (0)
} while (0)
/******************************************************************************/
#if defined(B_ENDIAN) || defined(NEED_ALIGN)
#define in_uint32_le(s, v) do \
{ \
{ \
(v) = (unsigned int) \
( \
(*((unsigned char*)((s)->p + 0)) << 0) | \
@ -229,19 +229,19 @@ struct stream
(*((unsigned char*)((s)->p + 3)) << 24) \
); \
(s)->p += 4; \
} while (0)
} while (0)
#else
#define in_uint32_le(s, v) do \
{ \
{ \
(v) = *((unsigned int*)((s)->p)); \
(s)->p += 4; \
} while (0)
} while (0)
#endif
/******************************************************************************/
#if defined(B_ENDIAN) || defined(NEED_ALIGN)
#define in_uint64_le(s, v) do \
{ \
{ \
(v) = (tui64) \
( \
(((tui64)(*((unsigned char*)((s)->p + 0)))) << 0) | \
@ -254,18 +254,18 @@ struct stream
(((tui64)(*((unsigned char*)((s)->p + 7)))) << 56) \
); \
(s)->p += 8; \
} while (0)
} while (0)
#else
#define in_uint64_le(s, v) do \
{ \
{ \
(v) = *((tui64*)((s)->p)); \
(s)->p += 8; \
} while (0)
} while (0)
#endif
/******************************************************************************/
#define in_uint32_be(s, v) do \
{ \
{ \
(v) = *((unsigned char*)((s)->p)); \
(s)->p++; \
(v) <<= 8; \
@ -277,45 +277,45 @@ struct stream
(v) <<= 8; \
(v) |= *((unsigned char*)((s)->p)); \
(s)->p++; \
} while (0)
} while (0)
/******************************************************************************/
#define out_uint8(s, v) do \
{ \
{ \
*((s)->p) = (unsigned char)(v); \
(s)->p++; \
} while (0)
} while (0)
/******************************************************************************/
#if defined(B_ENDIAN) || defined(NEED_ALIGN)
#define out_uint16_le(s, v) do \
{ \
{ \
*((s)->p) = (unsigned char)((v) >> 0); \
(s)->p++; \
*((s)->p) = (unsigned char)((v) >> 8); \
(s)->p++; \
} while (0)
} while (0)
#else
#define out_uint16_le(s, v) do \
{ \
{ \
*((unsigned short*)((s)->p)) = (unsigned short)(v); \
(s)->p += 2; \
} while (0)
} while (0)
#endif
/******************************************************************************/
#define out_uint16_be(s, v) do \
{ \
{ \
*((s)->p) = (unsigned char)((v) >> 8); \
(s)->p++; \
*((s)->p) = (unsigned char)((v) >> 0); \
(s)->p++; \
} while (0)
} while (0)
/******************************************************************************/
#if defined(B_ENDIAN) || defined(NEED_ALIGN)
#define out_uint32_le(s, v) do \
{ \
{ \
*((s)->p) = (unsigned char)((v) >> 0); \
(s)->p++; \
*((s)->p) = (unsigned char)((v) >> 8); \
@ -324,19 +324,19 @@ struct stream
(s)->p++; \
*((s)->p) = (unsigned char)((v) >> 24); \
(s)->p++; \
} while (0)
} while (0)
#else
#define out_uint32_le(s, v) do \
{ \
{ \
*((unsigned int*)((s)->p)) = (v); \
(s)->p += 4; \
} while (0)
} while (0)
#endif
/******************************************************************************/
#if defined(B_ENDIAN) || defined(NEED_ALIGN)
#define out_uint64_le(s, v) do \
{ \
{ \
*((s)->p) = (unsigned char)((v) >> 0); \
(s)->p++; \
*((s)->p) = (unsigned char)((v) >> 8); \
@ -353,18 +353,18 @@ struct stream
(s)->p++; \
*((s)->p) = (unsigned char)((v) >> 56); \
(s)->p++; \
} while (0)
} while (0)
#else
#define out_uint64_le(s, v) do \
{ \
{ \
*((tui64*)((s)->p)) = (v); \
(s)->p += 8; \
} while (0)
} while (0)
#endif
/******************************************************************************/
#define out_uint32_be(s, v) do \
{ \
{ \
*((s)->p) = (unsigned char)((v) >> 24); \
s->p++; \
*((s)->p) = (unsigned char)((v) >> 16); \
@ -373,21 +373,21 @@ struct stream
s->p++; \
*((s)->p) = (unsigned char)(v); \
(s)->p++; \
} while (0)
} while (0)
/******************************************************************************/
#define in_uint8p(s, v, n) do \
{ \
{ \
(v) = (s)->p; \
(s)->p += (n); \
} while (0)
} while (0)
/******************************************************************************/
#define in_uint8a(s, v, n) do \
{ \
{ \
g_memcpy((v), (s)->p, (n)); \
(s)->p += (n); \
} while (0)
} while (0)
/******************************************************************************/
#define in_uint8s(s, n) \
@ -395,10 +395,10 @@ struct stream
/******************************************************************************/
#define out_uint8p(s, v, n) do \
{ \
{ \
g_memcpy((s)->p, (v), (n)); \
(s)->p += (n); \
} while (0)
} while (0)
/******************************************************************************/
#define out_uint8a(s, v, n) \
@ -406,10 +406,10 @@ struct stream
/******************************************************************************/
#define out_uint8s(s, n) do \
{ \
{ \
g_memset((s)->p, 0, (n)); \
(s)->p += (n); \
} while (0)
} while (0)
/*
* @brief allocate a new stream
@ -418,11 +418,11 @@ struct stream
* @param _l length of new stream
******************************************************************************/
#define xstream_new(_s, _l) \
do \
{ \
do \
{ \
make_stream((_s)); \
init_stream((_s), (_l)); \
} while (0)
} while (0)
/**
* @brief release a previously allocated stream
@ -448,8 +448,8 @@ do \
#define xstream_wr_s32_le(_s, _var) TODO
#define xstream_rd_u64_le(_s, _v) \
do \
{ \
do \
{ \
_v = \
(tui64)(*((unsigned char *)_s->p)) | \
(((tui64) (*(((unsigned char *)_s->p) + 1))) << 8) | \
@ -460,11 +460,11 @@ do \
(((tui64) (*(((unsigned char *)_s->p) + 6))) << 48) | \
(((tui64) (*(((unsigned char *)_s->p) + 7))) << 56); \
_s->p += 8; \
} while (0)
} while (0)
#define xstream_wr_u64_le(_s, _v) \
do \
{ \
do \
{ \
*(((unsigned char *) _s->p) + 0) = (unsigned char) ((_v >> 0) & 0xff); \
*(((unsigned char *) _s->p) + 1) = (unsigned char) ((_v >> 8) & 0xff); \
*(((unsigned char *) _s->p) + 2) = (unsigned char) ((_v >> 16) & 0xff); \
@ -474,37 +474,37 @@ do \
*(((unsigned char *) _s->p) + 6) = (unsigned char) ((_v >> 48) & 0xff); \
*(((unsigned char *) _s->p) + 7) = (unsigned char) ((_v >> 56) & 0xff); \
_s->p += 8; \
} while (0)
} while (0)
/* copy data into stream */
#define xstream_copyin(_s, _dest, _len) \
do \
{ \
do \
{ \
g_memcpy((_s)->p, (_dest), (_len)); \
(_s)->p += (_len); \
} while (0)
} while (0)
/* copy data out of stream */
#define xstream_copyout(_dest, _s, _len) \
do \
{ \
do \
{ \
g_memcpy((_dest), (_s)->p, (_len)); \
(_s)->p += (_len); \
} while (0)
} while (0)
#define xstream_rd_string(_dest, _s, _len) \
do \
{ \
do \
{ \
g_memcpy((_dest), (_s)->p, (_len)); \
(_s)->p += (_len); \
} while (0)
} while (0)
#define xstream_wr_string(_s, _src, _len) \
do \
{ \
do \
{ \
g_memcpy((_s)->p, (_src), (_len)); \
(_s)->p += (_len); \
} while (0)
} while (0)
#define xstream_len(_s) (int) ((_s)->p - (_s)->data)
#define xstream_seek(_s, _len) (_s)->p += (_len)

363
common/pixman-region.c
View File

File diff suppressed because it is too large Load Diff

24
common/pixman-region.h
View File

@ -56,21 +56,21 @@ typedef struct pixman_region16 pixman_region16_t;
/* creation/destruction */
void pixman_region_init (pixman_region16_t *region);
void pixman_region_init_rect (pixman_region16_t *region,
int x,
int y,
unsigned int width,
unsigned int height);
/**/ int x,
/**/ int y,
/**/ unsigned int width,
/**/ unsigned int height);
void pixman_region_fini (pixman_region16_t *region);
pixman_bool_t pixman_region_union (pixman_region16_t *new_reg,
pixman_region16_t *reg1,
pixman_region16_t *reg2);
/**/ pixman_region16_t *reg1,
/**/ pixman_region16_t *reg2);
pixman_bool_t pixman_region_subtract (pixman_region16_t *reg_d,
pixman_region16_t *reg_m,
pixman_region16_t *reg_s);
/**/ pixman_region16_t *reg_m,
/**/ pixman_region16_t *reg_s);
pixman_bool_t pixman_region_intersect (pixman_region16_t *new_reg,
pixman_region16_t *reg1,
pixman_region16_t *reg2);
pixman_box16_t * pixman_region_rectangles (pixman_region16_t *region,
int *n_rects);
/**/ pixman_region16_t *reg1,
/**/ pixman_region16_t *reg2);
pixman_box16_t *pixman_region_rectangles (pixman_region16_t *region,
/**/ int *n_rects);
#endif

20
common/rail.h
View File

@ -78,9 +78,9 @@ struct rail_icon_info
int cmap_bytes;
int mask_bytes;
int data_bytes;
char* mask;
char* cmap;
char* data;
char *mask;
char *cmap;
char *data;
};
struct rail_window_rect
@ -95,8 +95,8 @@ struct rail_notify_icon_infotip
{
int timeout;
int flags;
char* text;
char* title;
char *text;
char *title;
};
struct rail_window_state_order
@ -105,7 +105,7 @@ struct rail_window_state_order
int style;
int extended_style;
int show_state;
char* title_info;
char *title_info;
int client_offset_x;
int client_offset_y;
int client_area_width;
@ -119,17 +119,17 @@ struct rail_window_state_order
int window_width;
int window_height;
int num_window_rects;
struct rail_window_rect* window_rects;
struct rail_window_rect *window_rects;
int visible_offset_x;
int visible_offset_y;
int num_visibility_rects;
struct rail_window_rect* visibility_rects;
struct rail_window_rect *visibility_rects;
};
struct rail_notify_state_order
{
int version;
char* tool_tip;
char *tool_tip;
struct rail_notify_icon_infotip infotip;
int state;
int icon_cache_entry;
@ -141,7 +141,7 @@ struct rail_monitored_desktop_order
{
int active_window_id;
int num_window_ids;
int* window_ids;
int *window_ids;
};
#endif

2
common/thread_calls.c
View File

@ -55,7 +55,7 @@ tc_thread_create(unsigned long (__stdcall *start_routine)(void *), void *arg)
}
#else
int
tc_thread_create(void * (* start_routine)(void *), void *arg)
tc_thread_create(void *(* start_routine)(void *), void *arg)
{
int rv = 0;
pthread_t thread = (pthread_t)0;

2
common/thread_calls.h
View File

@ -24,7 +24,7 @@
#include "arch.h"
int
tc_thread_create(THREAD_RV (THREAD_CC * start_routine)(void*), void* arg);
tc_thread_create(THREAD_RV (THREAD_CC *start_routine)(void *), void *arg);
tbus
tc_get_threadid(void);
int

11
common/trans.c
View File

@ -28,6 +28,7 @@
#include "arch.h"
#include "parse.h"
#include "ssl_calls.h"
#include "log.h"
#define MAX_SBYTES 0
@ -662,7 +663,7 @@ trans_write_copy_s(struct trans *self, struct stream *out_s)
/*****************************************************************************/
int
trans_write_copy(struct trans* self)
trans_write_copy(struct trans *self)
{
return trans_write_copy_s(self, self->out_s);
}
@ -824,7 +825,9 @@ trans_listen_address(struct trans *self, char *port, const char *address)
{
self->sck = g_tcp_socket();
if (self->sck < 0)
{
return 1;
}
g_tcp_set_non_blocking(self->sck);
@ -846,7 +849,9 @@ trans_listen_address(struct trans *self, char *port, const char *address)
self->sck = g_tcp_local_socket();
if (self->sck < 0)
{
return 1;
}
g_tcp_set_non_blocking(self->sck);
@ -975,13 +980,13 @@ trans_set_tls_mode(struct trans *self, const char *key, const char *cert,
self->tls = ssl_tls_create(self, key, cert);
if (self->tls == NULL)
{
g_writeln("trans_set_tls_mode: ssl_tls_create malloc error");
LOG(LOG_LEVEL_ERROR, "trans_set_tls_mode: ssl_tls_create malloc error");
return 1;
}
if (ssl_tls_accept(self->tls, ssl_protocols, tls_ciphers) != 0)
{
g_writeln("trans_set_tls_mode: ssl_tls_accept failed");
LOG(LOG_LEVEL_ERROR, "trans_set_tls_mode: ssl_tls_accept failed");
return 1;
}

52
common/trans.h
View File

@ -40,9 +40,9 @@
struct trans; /* forward declaration */
struct xrdp_tls;
typedef int (*ttrans_data_in)(struct trans* self);
typedef int (*ttrans_conn_in)(struct trans* self,
struct trans* new_self);
typedef int (*ttrans_data_in)(struct trans *self);
typedef int (*ttrans_conn_in)(struct trans *self,
struct trans *new_self);
typedef int (*tis_term)(void);
typedef int (*trans_recv_proc) (struct trans *self, char *ptr, int len);
typedef int (*trans_send_proc) (struct trans *self, const char *data, int len);
@ -97,13 +97,13 @@ struct trans
int type1; /* 1 listener 2 server 3 client */
ttrans_data_in trans_data_in;
ttrans_conn_in trans_conn_in;
void* callback_data;
void *callback_data;
int header_size;
struct stream* in_s;
struct stream* out_s;
char* listen_filename;
struct stream *in_s;
struct stream *out_s;
char *listen_filename;
tis_term is_term; /* used to test for exit */
struct stream* wait_s;
struct stream *wait_s;
char addr[256];
char port[256];
int no_stream_init_on_data_in;
@ -118,43 +118,43 @@ struct trans
enum xrdp_source my_source;
};
struct trans*
struct trans *
trans_create(int mode, int in_size, int out_size);
void
trans_delete(struct trans* self);
trans_delete(struct trans *self);
void
trans_delete_from_child(struct trans* self);
trans_delete_from_child(struct trans *self);
int
trans_get_wait_objs(struct trans* self, tbus* objs, int* count);
trans_get_wait_objs(struct trans *self, tbus *objs, int *count);
int
trans_get_wait_objs_rw(struct trans *self,
tbus *robjs, int *rcount,
tbus *wobjs, int *wcount, int *timeout);
int
trans_check_wait_objs(struct trans* self);
trans_check_wait_objs(struct trans *self);
int
trans_force_read_s(struct trans* self, struct stream* in_s, int size);
trans_force_read_s(struct trans *self, struct stream *in_s, int size);
int
trans_force_write_s(struct trans* self, struct stream* out_s);
trans_force_write_s(struct trans *self, struct stream *out_s);
int
trans_force_read(struct trans* self, int size);
trans_force_read(struct trans *self, int size);
int
trans_force_write(struct trans* self);
trans_force_write(struct trans *self);
int
trans_write_copy(struct trans* self);
trans_write_copy(struct trans *self);
int
trans_write_copy_s(struct trans* self, struct stream* out_s);
trans_write_copy_s(struct trans *self, struct stream *out_s);
int
trans_connect(struct trans* self, const char* server, const char* port,
trans_connect(struct trans *self, const char *server, const char *port,
int timeout);
int
trans_listen_address(struct trans* self, char* port, const char* address);
trans_listen_address(struct trans *self, char *port, const char *address);
int
trans_listen(struct trans* self, char* port);
struct stream*
trans_get_in_s(struct trans* self);
struct stream*
trans_get_out_s(struct trans* self, int size);
trans_listen(struct trans *self, char *port);
struct stream *
trans_get_in_s(struct trans *self);
struct stream *
trans_get_out_s(struct trans *self, int size);
int
trans_set_tls_mode(struct trans *self, const char *key, const char *cert,
long ssl_protocols, const char *tls_ciphers);

15
xrdp/xrdp.c
View File

@ -445,7 +445,6 @@ int
main(int argc, char **argv)
{
int exit_status = 0;
int test;
enum logReturns error;
struct xrdp_startup_params startup_params = {0};
int pid;
@ -453,17 +452,19 @@ main(int argc, char **argv)
int daemon;
char text[256];
const char *pid_file = XRDP_PID_PATH "/xrdp.pid";
int errored_argc;
#ifdef XRDP_DEBUG
int test;
for (test = 0; test < argc; test++)
{
g_writeln("Argument %i - %s", test, argv[test]);
}
#endif
g_init("xrdp");
ssl_init();
for (test = 0; test < argc; test++)
{
DEBUG(("Argument %i - %s", test, argv[test]));
}
startup_params.xrdp_ini = XRDP_CFG_PATH "/xrdp.ini";
errored_argc = xrdp_process_params(argc, argv, &startup_params);