security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Remove recently added debug output

Browse Source
This commit is contained in:
Werner Koch 2010-12-02 13:53:18 +00:00
parent 3d9e25e072
commit 6dda170e32
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
agent/gpg-agent.c
View File

@ -1429,7 +1429,6 @@ get_agent_scd_notify_event (void)
} }
} }
log_debug ("returning notify handle %p\n", the_event);
return the_event; return the_event;
} }
#endif /*HAVE_W32_SYSTEM && !HAVE_W32CE_SYSTEM*/ #endif /*HAVE_W32_SYSTEM && !HAVE_W32CE_SYSTEM*/
@ -1800,11 +1799,9 @@ start_connection_thread (void *arg)
{ {
ctrl_t ctrl = arg; ctrl_t ctrl = arg;
if (opt.verbose)
log_debug ("handler 0x%lx checking nonce\n", pth_thread_id ());
if (check_nonce (ctrl, &socket_nonce)) if (check_nonce (ctrl, &socket_nonce))
{ {
log_debug ("handler 0x%lx nonce check FAILED\n", pth_thread_id ()); log_error ("handler 0x%lx nonce check FAILED\n", pth_thread_id ());
return NULL; return NULL;
} }
@ -1924,7 +1921,6 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
for (;;) for (;;)
{ {
log_debug ("%s: Begin main loop\n", __func__);
/* Make sure that our signals are not blocked. */ /* Make sure that our signals are not blocked. */
pth_sigmask (SIG_UNBLOCK, &sigs, NULL); pth_sigmask (SIG_UNBLOCK, &sigs, NULL);
@ -1934,7 +1930,6 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
if (pth_ctrl (PTH_CTRL_GETTHREADS) == 1) if (pth_ctrl (PTH_CTRL_GETTHREADS) == 1)
break; /* ready */ break; /* ready */
log_debug ("%s: shutdown pending\n", __func__);
/* Do not accept new connections but keep on running the /* Do not accept new connections but keep on running the
loop to cope with the timer events. */ loop to cope with the timer events. */
FD_ZERO (&fdset); FD_ZERO (&fdset);
@ -1953,7 +1948,6 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
nexttick.tv_usec = 0; nexttick.tv_usec = 0;
} }
time_ev = pth_event (PTH_EVENT_TIME, nexttick); time_ev = pth_event (PTH_EVENT_TIME, nexttick);
log_debug ("%s: time event created\n", __func__);
} }
/* POSIX says that fd_set should be implemented as a structure, /* POSIX says that fd_set should be implemented as a structure,
@ -1963,9 +1957,7 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
if (time_ev) if (time_ev)
pth_event_concat (ev, time_ev, NULL); pth_event_concat (ev, time_ev, NULL);
log_debug ("%s: Pre-select\n", __func__);
ret = pth_select_ev (nfd+1, &read_fdset, NULL, NULL, NULL, ev); ret = pth_select_ev (nfd+1, &read_fdset, NULL, NULL, NULL, ev);
log_debug ("%s: Post-select res=%d\n", __func__, ret);
if (time_ev) if (time_ev)
pth_event_isolate (time_ev); pth_event_isolate (time_ev);
@ -1996,10 +1988,8 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
continue; continue;
} }
log_debug ("%s: Checking events\n", __func__);
if (pth_event_occurred (ev)) if (pth_event_occurred (ev))
{ {
log_debug ("%s: Got event\n", __func__);
#if defined(HAVE_W32_SYSTEM) && defined(PTH_EVENT_HANDLE) #if defined(HAVE_W32_SYSTEM) && defined(PTH_EVENT_HANDLE)
agent_sigusr2_action (); agent_sigusr2_action ();
#else #else
@ -2009,14 +1999,12 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
if (time_ev && pth_event_occurred (time_ev)) if (time_ev && pth_event_occurred (time_ev))
{ {
log_debug ("%s: Got tick event\n", __func__);
pth_event_free (time_ev, PTH_FREE_ALL); pth_event_free (time_ev, PTH_FREE_ALL);
time_ev = NULL; time_ev = NULL;
handle_tick (); handle_tick ();
} }
log_debug ("%s: Restore mask\n", __func__);
/* We now might create new threads and because we don't want any /* We now might create new threads and because we don't want any
signals (as we are handling them here) to be delivered to a signals (as we are handling them here) to be delivered to a
new thread. Thus we need to block those signals. */ new thread. Thus we need to block those signals. */
@ -2026,11 +2014,9 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
{ {
ctrl_t ctrl; ctrl_t ctrl;
log_debug ("%s: Pre-accept\n", __func__);
plen = sizeof paddr; plen = sizeof paddr;
fd = INT2FD (pth_accept (FD2INT(listen_fd), fd = INT2FD (pth_accept (FD2INT(listen_fd),
(struct sockaddr *)&paddr, &plen)); (struct sockaddr *)&paddr, &plen));
log_debug ("%s: Post-accept fd=%d\n", __func__, fd);
if (fd == GNUPG_INVALID_FD) if (fd == GNUPG_INVALID_FD)
{ {
log_error ("accept failed: %s\n", strerror (errno)); log_error ("accept failed: %s\n", strerror (errno));
@ -2052,7 +2038,6 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
{ {
char threadname[50]; char threadname[50];
log_debug ("%s: Spawning handler\n", __func__);
snprintf (threadname, sizeof threadname-1, snprintf (threadname, sizeof threadname-1,
"conn fd=%d (gpg)", FD2INT(fd)); "conn fd=%d (gpg)", FD2INT(fd));
threadname[sizeof threadname -1] = 0; threadname[sizeof threadname -1] = 0;
@ -2065,7 +2050,6 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
assuan_sock_close (fd); assuan_sock_close (fd);
xfree (ctrl); xfree (ctrl);
} }
log_debug ("%s: handler spawned\n", __func__);
} }
fd = GNUPG_INVALID_FD; fd = GNUPG_INVALID_FD;
} }
@ -2075,7 +2059,6 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
{ {
ctrl_t ctrl; ctrl_t ctrl;
log_debug ("%s: SSH STUFF!\n", __func__);
plen = sizeof paddr; plen = sizeof paddr;
fd = INT2FD(pth_accept (FD2INT(listen_fd_ssh), fd = INT2FD(pth_accept (FD2INT(listen_fd_ssh),
(struct sockaddr *)&paddr, &plen)); (struct sockaddr *)&paddr, &plen));
@ -2116,10 +2099,8 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
} }
fd = GNUPG_INVALID_FD; fd = GNUPG_INVALID_FD;
} }
log_debug ("%s: End main loop\n", __func__);
} }
log_debug ("%s: main loop terminated\n", __func__);
pth_event_free (ev, PTH_FREE_ALL); pth_event_free (ev, PTH_FREE_ALL);
if (time_ev) if (time_ev)
pth_event_free (time_ev, PTH_FREE_ALL); pth_event_free (time_ev, PTH_FREE_ALL);