diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2016-08-05 14:38:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 14:38:41 -0700 |
| commit | 8353baab3d361bcdebb32f1677dd066e0b255dc9 (patch) | |
| tree | 38bd74dc119bdc115d5876383d7a65ff3e19debd /sesman/libscp/libscp_v1s.c | |
| parent | 81fe939dd346420d41eb2afcd6c8c05a422a9e7b (diff) | |
| parent | ace7d2c822937a9cb0637946f85d1fbd63562c44 (diff) | |
| download | xrdp-proprietary-8353baab3d361bcdebb32f1677dd066e0b255dc9.tar.gz xrdp-proprietary-8353baab3d361bcdebb32f1677dd066e0b255dc9.zip | |
Merge pull request #390 from proski/june21
Cleanups and C++ compatibility
Diffstat (limited to 'sesman/libscp/libscp_v1s.c')
| -rw-r--r-- | sesman/libscp/libscp_v1s.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sesman/libscp/libscp_v1s.c b/sesman/libscp/libscp_v1s.c index b7d422c7..284c9b52 100644 --- a/sesman/libscp/libscp_v1s.c +++ b/sesman/libscp/libscp_v1s.c @@ -150,12 +150,12 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION *c, struct SCP_SES if (sz == SCP_ADDRESS_TYPE_IPV4) { in_uint32_be(c->in_s, size); - scp_session_set_addr(session, SCP_ADDRESS_TYPE_IPV4_BIN, &size); + scp_session_set_addr(session, sz, &size); } else if (sz == SCP_ADDRESS_TYPE_IPV6) { in_uint8a(c->in_s, buf, 16); - scp_session_set_addr(session, SCP_ADDRESS_TYPE_IPV6_BIN, buf); + scp_session_set_addr(session, sz, buf); } buf[256] = '\0'; @@ -202,7 +202,7 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION *c, struct SCP_SES } enum SCP_SERVER_STATES_E -scp_v1s_deny_connection(struct SCP_CONNECTION *c, char *reason) +scp_v1s_deny_connection(struct SCP_CONNECTION *c, const char *reason) { int rlen; @@ -235,7 +235,8 @@ scp_v1s_deny_connection(struct SCP_CONNECTION *c, char *reason) } enum SCP_SERVER_STATES_E -scp_v1s_request_password(struct SCP_CONNECTION *c, struct SCP_SESSION *s, char *reason) +scp_v1s_request_password(struct SCP_CONNECTION *c, struct SCP_SESSION *s, + const char *reason) { tui8 sz; tui32 version; @@ -392,7 +393,7 @@ scp_v1s_connect_new_session(struct SCP_CONNECTION *c, SCP_DISPLAY d) /* 032 */ enum SCP_SERVER_STATES_E -scp_v1s_connection_error(struct SCP_CONNECTION *c, char *error) +scp_v1s_connection_error(struct SCP_CONNECTION *c, const char *error) { tui16 len; |