- markus@cvs.openbsd.org 2001/06/19 15:40:45
[session.c]
allocate and free at the same level.
+ - markus@cvs.openbsd.org 2001/06/20 13:56:39
+ [channels.c channels.h clientloop.c packet.c serverloop.c]
+ move from channel_stop_listening to channel_free_all,
+ call channel_free_all before calling waitpid() in serverloop.
+ fixes the utmp handling; report from Lutz.Jaenicke@aet.TU-Cottbus.DE
20010615
- (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.125 2001/06/07 20:23:04 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.126 2001/06/20 13:56:39 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
channels = xmalloc(channels_alloc * sizeof(Channel *));
for (i = 0; i < channels_alloc; i++)
channels[i] = NULL;
- /*
- * Kludge: arrange a call to channel_stop_listening if we
- * terminate with fatal().
- */
- fatal_add_cleanup((void (*) (void *)) channel_stop_listening, NULL);
+ fatal_add_cleanup((void (*) (void *)) channel_free_all, NULL);
}
/* Try to find a free slot where to put the new channel. */
for (found = -1, i = 0; i < channels_alloc; i++)
xfree(c);
}
-
-/*
- * Stops listening for channels, and removes any unix domain sockets that we
- * might have.
- */
-
void
-channel_stop_listening()
+channel_free_all(void)
{
int i;
- Channel *c;
- for (i = 0; i < channels_alloc; i++) {
- c = channels[i];
- if (c != NULL) {
- switch (c->type) {
- case SSH_CHANNEL_AUTH_SOCKET:
- close(c->sock);
- /* auth_sock_cleanup_proc deletes the socket */
- channel_free(c);
- break;
- case SSH_CHANNEL_PORT_LISTENER:
- case SSH_CHANNEL_RPORT_LISTENER:
- case SSH_CHANNEL_X11_LISTENER:
- close(c->sock);
- channel_free(c);
- break;
- default:
- break;
- }
- }
- }
+ for (i = 0; i < channels_alloc; i++)
+ if (channels[i] != NULL)
+ channel_free(channels[i]);
}
/*
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* RCSID("$OpenBSD: channels.h,v 1.38 2001/06/16 08:50:39 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.39 2001/06/20 13:56:39 markus Exp $"); */
#ifndef CHANNEL_H
#define CHANNEL_H
channel_set_fds(int id, int rfd, int wfd, int efd,
int extusage, int nonblock);
void channel_free(Channel *c);
+void channel_free_all(void);
void channel_send_open(int id);
void channel_request(int id, char *service, int wantconfirm);
void channel_output_poll(void);
int channel_not_very_much_buffered_data(void);
-void channel_stop_listening(void);
void channel_close_all(void);
+void channel_free_all(void);
int channel_still_open(void);
char *channel_open_message(void);
int channel_find_open(void);
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.75 2001/06/04 23:07:20 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.76 2001/06/20 13:56:39 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
leave_raw_mode();
/* Stop listening for new connections. */
- channel_stop_listening();
+ channel_close_all(); /* proto1 only XXXX */
printf("%c& [backgrounded]\n", escape_char);
if (have_pty)
signal(SIGWINCH, SIG_DFL);
- /* Stop listening for connections. */
- channel_stop_listening();
+ channel_free_all();
if (have_pty)
leave_raw_mode();
*/
#include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.66 2001/06/12 16:11:26 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.67 2001/06/20 13:56:39 markus Exp $");
#include "xmalloc.h"
#include "buffer.h"
packet_write_wait();
/* Stop listening for connections. */
- channel_stop_listening();
+ channel_close_all();
/* Close the connection. */
packet_close();
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.68 2001/06/04 23:07:20 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.69 2001/06/20 13:56:39 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
close(fdin);
fdin = -1;
- /* Stop listening for channels; this removes unix domain sockets. */
- channel_stop_listening();
+ channel_free_all();
/* We no longer want our SIGCHLD handler to be called. */
signal(SIGCHLD, SIG_DFL);
if (writeset)
xfree(writeset);
+ channel_free_all();
+
signal(SIGCHLD, SIG_DFL);
while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
session_close_by_pid(pid, status);
- channel_stop_listening();
}
void