hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added qse_httpd_dns_server_t and qse_httpd_urs_server_t.

Browse Source 
deleted qse_httpd_natr_t.
deleted QSE_HTTPD_DNSNOA and QSE_HTTPD_DNSNOAAAA
added QSE_HTTPD_DNS_SERVER_A and QSE_HTTPD_DNS_SERVER_AAAA
This commit is contained in:
hyung-hwan
2014-09-11 09:02:07 +00:00
parent 3fd82c7943
commit 97c528ca1f
7 changed files with 88 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qse/lib/http/httpd-proxy.c
View File

@ -67,8 +67,8 @@ struct task_proxy_t
qse_size_t qpath_pos_in_reqfwdbuf; /* position where qpath begins */
qse_size_t qpath_len_in_reqfwdbuf; /* length of qpath + qparams */
qse_httpd_natr_t dns_server;
qse_httpd_natr_t urs_server;
qse_httpd_dns_server_t dns_server;
qse_httpd_urs_server_t urs_server;
qse_mchar_t* pseudonym;
qse_htrd_t* peer_htrd;

7
qse/lib/http/httpd-std-dns.h
View File

@ -795,7 +795,7 @@ printf (">>tmr_dns_tmout_handle req->>%p\n", req);
dc->req_count--;
}
static int dns_send (qse_httpd_t* httpd, qse_httpd_dns_t* dns, const qse_mchar_t* name, qse_httpd_resol_t resol, const qse_httpd_natr_t* dns_server, void* ctx)
static int dns_send (qse_httpd_t* httpd, qse_httpd_dns_t* dns, const qse_mchar_t* name, qse_httpd_resol_t resol, const qse_httpd_dns_server_t* dns_server, void* ctx)
{
dns_ctx_t* dc = (dns_ctx_t*)dns->ctx;
httpd_xtn_t* httpd_xtn;
@ -857,12 +857,13 @@ printf ("DNS REALLY SENING>>>>>>>>>>>>>>>>>>>>>>>\n");
req->resol = resol;
req->ctx = ctx;
if (!(httpd->opt.trait & QSE_HTTPD_DNSNOA))
if (dns_server->flags & QSE_HTTPD_DNS_SERVER_A)
req->qalen = init_dns_query (req->qa, QSE_SIZEOF(req->qa), name, DNS_QTYPE_A, req->seqa);
else
req->flags |= DNS_REQ_A_NX;
if (!(httpd->opt.trait & QSE_HTTPD_DNSNOAAAA))
if (dns_server->flags & QSE_HTTPD_DNS_SERVER_AAAA)
req->qaaaalen = init_dns_query (req->qaaaa, QSE_SIZEOF(req->qaaaa), name, DNS_QTYPE_AAAA, req->seqaaaa);
else
req->flags |= DNS_REQ_AAAA_NX;

2
qse/lib/http/httpd-std-urs.h
View File

@ -348,7 +348,7 @@ printf ("urs timed out....\n");
dc->req_count--;
}
static int urs_send (qse_httpd_t* httpd, qse_httpd_urs_t* urs, const qse_mchar_t* url, qse_httpd_rewrite_t rewrite, const qse_httpd_natr_t* urs_server, void* ctx)
static int urs_send (qse_httpd_t* httpd, qse_httpd_urs_t* urs, const qse_mchar_t* url, qse_httpd_rewrite_t rewrite, const qse_httpd_urs_server_t* urs_server, void* ctx)
{
urs_ctx_t* dc = (urs_ctx_t*)urs->ctx;
httpd_xtn_t* httpd_xtn;

7
qse/lib/http/httpd.c
View File

@ -1831,11 +1831,8 @@ qse_mchar_t* qse_httpd_escapehtml (qse_httpd_t* httpd, const qse_mchar_t* str)
/* ----------------------------------------------------------------------- */
int qse_httpd_resolname (qse_httpd_t* httpd, const qse_mchar_t* name, qse_httpd_resol_t resol, const qse_httpd_natr_t* dns_server, void* ctx)
int qse_httpd_resolname (qse_httpd_t* httpd, const qse_mchar_t* name, qse_httpd_resol_t resol, const qse_httpd_dns_server_t* dns_server, void* ctx)
{
/* TODO: find the name in cache */
/* not found in the cache */
printf ("DNS_SEND.........................\n");
if (!httpd->dnsactive)
{
@ -1847,7 +1844,7 @@ printf ("DNS_SEND.........................\n");
return httpd->opt.scb.dns.send (httpd, &httpd->dns, name, resol, dns_server, ctx);
}
int qse_httpd_rewriteurl (qse_httpd_t* httpd, const qse_mchar_t* url, qse_httpd_rewrite_t rewrite, const qse_httpd_natr_t* urs_server, void* ctx)
int qse_httpd_rewriteurl (qse_httpd_t* httpd, const qse_mchar_t* url, qse_httpd_rewrite_t rewrite, const qse_httpd_urs_server_t* urs_server, void* ctx)
{
if (!httpd->ursactive)
{