Mercurial > dropbear
comparison cli-service.c @ 165:0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sun, 02 Jan 2005 20:25:56 +0000 |
parents | e3adf4cf5465 |
children | 454a34b2dfd1 |
comparison
equal
deleted
inserted
replaced
161:b9d3f725e00b | 165:0cfba3034be5 |
---|---|
31 #include "session.h" | 31 #include "session.h" |
32 #include "ssh.h" | 32 #include "ssh.h" |
33 | 33 |
34 void send_msg_service_request(char* servicename) { | 34 void send_msg_service_request(char* servicename) { |
35 | 35 |
36 TRACE(("enter send_msg_service_request: servicename='%s'", servicename)); | 36 TRACE(("enter send_msg_service_request: servicename='%s'", servicename)) |
37 | 37 |
38 CHECKCLEARTOWRITE(); | 38 CHECKCLEARTOWRITE(); |
39 | 39 |
40 buf_putbyte(ses.writepayload, SSH_MSG_SERVICE_REQUEST); | 40 buf_putbyte(ses.writepayload, SSH_MSG_SERVICE_REQUEST); |
41 buf_putstring(ses.writepayload, servicename, strlen(servicename)); | 41 buf_putstring(ses.writepayload, servicename, strlen(servicename)); |
42 | 42 |
43 encrypt_packet(); | 43 encrypt_packet(); |
44 TRACE(("leave send_msg_service_request")); | 44 TRACE(("leave send_msg_service_request")) |
45 } | 45 } |
46 | 46 |
47 /* This just sets up the state variables right for the main client session loop | 47 /* This just sets up the state variables right for the main client session loop |
48 * to deal with */ | 48 * to deal with */ |
49 void recv_msg_service_accept() { | 49 void recv_msg_service_accept() { |
50 | 50 |
51 unsigned char* servicename; | 51 unsigned char* servicename; |
52 unsigned int len; | 52 unsigned int len; |
53 | 53 |
54 TRACE(("enter recv_msg_service_accept")); | 54 TRACE(("enter recv_msg_service_accept")) |
55 | 55 |
56 servicename = buf_getstring(ses.payload, &len); | 56 servicename = buf_getstring(ses.payload, &len); |
57 | 57 |
58 /* ssh-userauth */ | 58 /* ssh-userauth */ |
59 if (cli_ses.state == SERVICE_AUTH_REQ_SENT | 59 if (cli_ses.state == SERVICE_AUTH_REQ_SENT |
60 && len == SSH_SERVICE_USERAUTH_LEN | 60 && len == SSH_SERVICE_USERAUTH_LEN |
61 && strncmp(SSH_SERVICE_USERAUTH, servicename, len) == 0) { | 61 && strncmp(SSH_SERVICE_USERAUTH, servicename, len) == 0) { |
62 | 62 |
63 cli_ses.state = SERVICE_AUTH_ACCEPT_RCVD; | 63 cli_ses.state = SERVICE_AUTH_ACCEPT_RCVD; |
64 m_free(servicename); | 64 m_free(servicename); |
65 TRACE(("leave recv_msg_service_accept: done ssh-userauth")); | 65 TRACE(("leave recv_msg_service_accept: done ssh-userauth")) |
66 return; | 66 return; |
67 } | 67 } |
68 | 68 |
69 /* ssh-connection */ | 69 /* ssh-connection */ |
70 if (cli_ses.state == SERVICE_CONN_REQ_SENT | 70 if (cli_ses.state == SERVICE_CONN_REQ_SENT |
75 dropbear_exit("request for connection before auth"); | 75 dropbear_exit("request for connection before auth"); |
76 } | 76 } |
77 | 77 |
78 cli_ses.state = SERVICE_CONN_ACCEPT_RCVD; | 78 cli_ses.state = SERVICE_CONN_ACCEPT_RCVD; |
79 m_free(servicename); | 79 m_free(servicename); |
80 TRACE(("leave recv_msg_service_accept: done ssh-connection")); | 80 TRACE(("leave recv_msg_service_accept: done ssh-connection")) |
81 return; | 81 return; |
82 } | 82 } |
83 | 83 |
84 dropbear_exit("unrecognised service accept"); | 84 dropbear_exit("unrecognised service accept"); |
85 /* m_free(servicename); not reached */ | 85 /* m_free(servicename); not reached */ |