diff options
Diffstat (limited to 'http.c')
| -rw-r--r-- | http.c | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -368,47 +368,48 @@ void mog_http_quit_step(struct mog_fd *mfd) /* stringify the address for tracers */ static MOG_NOINLINE void -trace_http_accepted(struct mog_fd *mfd) +trace_http_accepted(struct mog_fd *mfd, const char *listen_addr) { #ifdef HAVE_SYSTEMTAP struct mog_packaddr *mpa = &mfd->as.http.mpa; struct mog_ni ni; mog_nameinfo(mpa, &ni); - TRACE(CMOGSTORED_HTTP_ACCEPTED(mfd->fd, ni.ni_host, ni.ni_serv)); + TRACE(CMOGSTORED_HTTP_ACCEPTED(mfd->fd, ni.ni_host, ni.ni_serv, + listen_addr)); #endif /* !HAVE_SYSTEMTAP */ } -static void http_post_accept_common(struct mog_fd *mfd, struct mog_svc *svc, +static void http_post_accept_common(struct mog_fd *mfd, struct mog_accept *ac, union mog_sockaddr *msa, socklen_t salen) { struct mog_http *http = &mfd->as.http; - mog_http_init(http, svc); + mog_http_init(http, ac->svc); mog_packaddr_init(&http->mpa, msa, salen); if (TRACE_ENABLED(CMOGSTORED_HTTP_ACCEPTED)) - trace_http_accepted(mfd); + trace_http_accepted(mfd, ac->addrinfo->orig); - mog_idleq_add(svc->queue, mfd, MOG_QEV_RD); + mog_idleq_add(ac->svc->queue, mfd, MOG_QEV_RD); } /* called immediately after accept(), this initializes the mfd (once) */ -void mog_http_post_accept(int fd, struct mog_svc *svc, +void mog_http_post_accept(int fd, struct mog_accept *ac, union mog_sockaddr *msa, socklen_t salen) { struct mog_fd *mfd = mog_fd_init(fd, MOG_FD_TYPE_HTTP); - http_post_accept_common(mfd, svc, msa, salen); + http_post_accept_common(mfd, ac, msa, salen); } /* called immediately after accept(), this initializes the mfd (once) */ -void mog_httpget_post_accept(int fd, struct mog_svc *svc, +void mog_httpget_post_accept(int fd, struct mog_accept *ac, union mog_sockaddr *msa, socklen_t salen) { struct mog_fd *mfd = mog_fd_init(fd, MOG_FD_TYPE_HTTPGET); - http_post_accept_common(mfd, svc, msa, salen); + http_post_accept_common(mfd, ac, msa, salen); } /* |