Mercurial > dropbear

comparison common-channel.c @ 1295:750ec4ec4cbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert #ifdef to #if, other build changes
author Matt Johnston <matt@ucc.asn.au>
date Wed, 04 May 2016 15:33:40 +0200
parents af940cefdba1
children 0b1162fbf1c6
comparison
equal deleted inserted replaced
1294:56aba7dedbea 1295:750ec4ec4cbe
76 ses.channels[0] = NULL; 76 ses.channels[0] = NULL;
77 ses.chancount = 0; 77 ses.chancount = 0;
78 78
79 ses.chantypes = chantypes; 79 ses.chantypes = chantypes;
80 80
81 #ifdef USING_LISTENERS 81 #if DROPBEAR_LISTENERS
82 listeners_initialise(); 82 listeners_initialise();
83 #endif 83 #endif
84 84
85 } 85 }
86 86
253 if (do_check_close) { 253 if (do_check_close) {
254 check_close(channel); 254 check_close(channel);
255 } 255 }
256 } 256 }
257 257
258 #ifdef USING_LISTENERS 258 #if DROPBEAR_LISTENERS
259 handle_listeners(readfds); 259 handle_listeners(readfds);
260 #endif 260 #endif
261 } 261 }
262 262
263 263
593 FD_SET(channel->errfd, writefds); 593 FD_SET(channel->errfd, writefds);
594 } 594 }
595 595
596 } /* foreach channel */ 596 } /* foreach channel */
597 597
598 #ifdef USING_LISTENERS 598 #if DROPBEAR_LISTENERS
599 set_listener_fds(readfds); 599 set_listener_fds(readfds);
600 #endif 600 #endif
601 601
602 } 602 }
603 603
1112 m_close(fd); 1112 m_close(fd);
1113 } 1113 }
1114 } 1114 }
1115 1115
1116 1116
1117 #if defined(USING_LISTENERS) || defined(DROPBEAR_CLIENT) 1117 #if (DROPBEAR_LISTENERS) || (DROPBEAR_CLIENT)
1118 /* Create a new channel, and start the open request. This is intended 1118 /* Create a new channel, and start the open request. This is intended
1119 * for X11, agent, tcp forwarding, and should be filled with channel-specific 1119 * for X11, agent, tcp forwarding, and should be filled with channel-specific
1120 * options, with the calling function calling encrypt_packet() after 1120 * options, with the calling function calling encrypt_packet() after
1121 * completion. It is mandatory for the caller to encrypt_packet() if 1121 * completion. It is mandatory for the caller to encrypt_packet() if
1122 * a channel is returned. NULL is returned on failure. */ 1122 * a channel is returned. NULL is returned on failure. */
1208 } 1208 }
1209 channel->await_open = 0; 1209 channel->await_open = 0;
1210 1210
1211 remove_channel(channel); 1211 remove_channel(channel);
1212 } 1212 }
1213 #endif /* USING_LISTENERS */ 1213 #endif /* DROPBEAR_LISTENERS */
1214 1214
1215 void send_msg_request_success() { 1215 void send_msg_request_success() {
1216 CHECKCLEARTOWRITE(); 1216 CHECKCLEARTOWRITE();
1217 buf_putbyte(ses.writepayload, SSH_MSG_REQUEST_SUCCESS); 1217 buf_putbyte(ses.writepayload, SSH_MSG_REQUEST_SUCCESS);
1218 encrypt_packet(); 1218 encrypt_packet();