diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2016-07-18 09:14:34 +0300 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2016-07-18 09:14:34 +0300 |
| commit | 10da6112bf80f2176e73aec3d017c4d7f452b564 (patch) | |
| tree | 849b54ada2b68dd58f8ea81017d1739d89ba447c | |
| parent | 4fb8e0103cc176d02ea86c450670dc54b143365a (diff) | |
rename LoginInfo to SessionInfo, don't need to pass infoType
| -rw-r--r-- | include/freerdp/freerdp.h | 6 | ||||
| -rw-r--r-- | libfreerdp-core/info.c | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h index be4ad3b..b3074f1 100644 --- a/include/freerdp/freerdp.h +++ b/include/freerdp/freerdp.h @@ -55,7 +55,7 @@ typedef int (*pSendChannelData)(freerdp* instance, int channelId, uint8* data, i typedef int (*pSendFrameAck)(freerdp* instance, int frame); typedef int (*pSendInvalidate)(freerdp* instance, int code, int x, int y, int w, int h); typedef int (*pReceiveChannelData)(freerdp* instance, int channelId, uint8* data, int size, int flags, int total_size); -typedef int (*pLoginInfo)(freerdp* instance, int infoType, uint8* data, int data_bytes); +typedef int (*pSessionInfo)(freerdp* instance, uint8* data, int data_bytes); struct rdp_context { @@ -77,6 +77,8 @@ struct rdp_context uint8 temp[32 * 1024]; }; +/* SessionInfo added with version 1 */ +#define VERSION_STRUCT_RDP_FREERDP 1 struct rdp_freerdp { rdpContext* context; /* 0 */ @@ -103,7 +105,7 @@ struct rdp_freerdp pSendFrameAck SendFrameAck; /* 66 */ pSendInvalidate SendInvalidate; /* 67 */ - pLoginInfo LoginInfo; /* 68 */ + pSessionInfo SessionInfo; /* 68 */ uint32 paddingE[80 - 69]; /* 69 */ }; diff --git a/libfreerdp-core/info.c b/libfreerdp-core/info.c index 27179c5..1c33ed4 100644 --- a/libfreerdp-core/info.c +++ b/libfreerdp-core/info.c @@ -695,15 +695,15 @@ tbool rdp_recv_save_session_info(rdpRdp* rdp, STREAM* s) { uint32 infoType; + if (rdp->instance->SessionInfo != NULL) + { + rdp->instance->SessionInfo(rdp->instance, stream_get_tail(s), stream_get_left(s)); + } + stream_read_uint32(s, infoType); /* infoType (4 bytes) */ //printf("%s\n", INFO_TYPE_LOGON_STRINGS[infoType]); - if (rdp->instance->LoginInfo != NULL) - { - rdp->instance->LoginInfo(rdp->instance, infoType, stream_get_tail(s), stream_get_left(s)); - } - switch (infoType) { case INFO_TYPE_LOGON: |