diff options
Diffstat (limited to 'xorg-server/os/xdmcp.c')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/os/xdmcp.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/xorg-server/os/xdmcp.c b/xorg-server/os/xdmcp.c index 3ce2b9f6b..bc7dcb3df 100644..100755 --- a/xorg-server/os/xdmcp.c +++ b/xorg-server/os/xdmcp.c @@ -674,15 +674,15 @@ XdmcpCloseDisplay(int sock) XdmcpBlockHandler(void *data, /* unused */ struct timeval **wt, void *pReadmask) { - fd_set *LastSelectMask = (fd_set *) pReadmask; + fd_set *last_select_mask = (fd_set *) pReadmask; CARD32 millisToGo; if (state == XDM_OFF) return; - FD_SET(xdmcpSocket, LastSelectMask); + FD_SET(xdmcpSocket, last_select_mask); #if defined(IPv6) && defined(AF_INET6) if (xdmcpSocket6 >= 0) - FD_SET(xdmcpSocket6, LastSelectMask); + FD_SET(xdmcpSocket6, last_select_mask); #endif if (timeOutTime == 0) return; @@ -702,23 +702,23 @@ XdmcpBlockHandler(void *data, /* unused */ XdmcpWakeupHandler(void *data, /* unused */ int i, void *pReadmask) { - fd_set *LastSelectMask = (fd_set *) pReadmask; + fd_set *last_select_mask = (fd_set *) pReadmask; fd_set devicesReadable; if (state == XDM_OFF) return; if (i > 0) { - if (FD_ISSET(xdmcpSocket, LastSelectMask)) { + if (FD_ISSET(xdmcpSocket, last_select_mask)) { receive_packet(xdmcpSocket); - FD_CLR(xdmcpSocket, LastSelectMask); + FD_CLR(xdmcpSocket, last_select_mask); } #if defined(IPv6) && defined(AF_INET6) - if (xdmcpSocket6 >= 0 && FD_ISSET(xdmcpSocket6, LastSelectMask)) { + if (xdmcpSocket6 >= 0 && FD_ISSET(xdmcpSocket6, last_select_mask)) { receive_packet(xdmcpSocket6); - FD_CLR(xdmcpSocket6, LastSelectMask); + FD_CLR(xdmcpSocket6, last_select_mask); } #endif - XFD_ANDSET(&devicesReadable, LastSelectMask, &EnabledDevices); + XFD_ANDSET(&devicesReadable, last_select_mask, &EnabledDevices); if (XFD_ANYSET(&devicesReadable)) { if (state == XDM_AWAIT_USER_INPUT) restart(); @@ -735,12 +735,12 @@ XdmcpWakeupHandler(void *data, /* unused */ static void XdmcpSelectHost(const struct sockaddr *host_sockaddr, - int host_len, ARRAY8Ptr AuthenticationName) + int host_len, ARRAY8Ptr auth_name) { state = XDM_START_CONNECTION; memmove(&req_sockaddr, host_sockaddr, host_len); req_socklen = host_len; - XdmcpSetAuthentication(AuthenticationName); + XdmcpSetAuthentication(auth_name); send_packet(); } @@ -784,7 +784,7 @@ void XdmcpHostSelected(int HostIdx) /*ARGSUSED*/ static void XdmcpAddHost(const struct sockaddr *from, int fromlen, - ARRAY8Ptr AuthenticationName, ARRAY8Ptr hostname, ARRAY8Ptr status) + ARRAY8Ptr auth_name, ARRAY8Ptr hostname, ARRAY8Ptr status) { #ifdef _MSC_VER char szHostName[100]; @@ -809,11 +809,11 @@ XdmcpAddHost(const struct sockaddr *from, g_Hosts[HostIdx].from=realloc(g_Hosts[HostIdx].from,g_Hosts[HostIdx].fromlen); memcpy(g_Hosts[HostIdx].from,from,fromlen); - g_Hosts[HostIdx].AuthenticationName.length=AuthenticationName->length; - g_Hosts[HostIdx].AuthenticationName.data=realloc(g_Hosts[HostIdx].AuthenticationName.data,AuthenticationName->length); - memcpy(g_Hosts[HostIdx].AuthenticationName.data,AuthenticationName->data,AuthenticationName->length); + g_Hosts[HostIdx].AuthenticationName.length=auth_name->length; + g_Hosts[HostIdx].AuthenticationName.data=realloc(g_Hosts[HostIdx].AuthenticationName.data,auth_name->length); + memcpy(g_Hosts[HostIdx].AuthenticationName.data,auth_name->data,auth_name->length); #else - XdmcpSelectHost(from, fromlen, AuthenticationName); + XdmcpSelectHost(from, fromlen, auth_name); #endif } @@ -1148,8 +1148,6 @@ send_query_msg(void) XdmcpWriteHeader(&buffer, &header); XdmcpWriteARRAYofARRAY8(&buffer, &AuthenticationNames); if (broadcast) { - int i; - for (i = 0; i < NumBroadcastAddresses; i++) XdmcpFlush(xdmcpSocket, &buffer, (XdmcpNetaddr) &BroadcastAddresses[i], |