wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 912259 - about:networking DNS Lookup Diagnostic Tool - patch over backend. r=mcmanus

Browse Source
This commit is contained in:
Catalin Iordache 2013-09-04 12:50:11 -04:00
parent 6f19a9a6ca
commit 0d2e09c3ea
2 changed files with 69 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
netwerk/base/src/Dashboard.cpp
View File

@ -25,6 +25,8 @@ Dashboard::Dashboard()
Dashboard::~Dashboard()
{
if (mDnsup.cancel)
mDnsup.cancel->Cancel(NS_ERROR_ABORT);
}
NS_IMETHODIMP
@ -403,66 +405,6 @@ Dashboard::RequestDNSInfo(NetDashboardCallback* cb)
return NS_OK;
}
NS_IMETHODIMP
Dashboard::RequestDNSLookup(const nsACString &aHost, NetDashboardCallback* cb)
{
if (mDnsup.cb)
return NS_ERROR_FAILURE;
mDnsup.cb = cb;
nsresult rv;
mDnsup.thread = NS_GetCurrentThread();
if (!mDnsup.serv) {
mDnsup.serv = do_GetService("@mozilla.org/network/dns-service;1", &rv);
if (NS_FAILED(rv)) {
mDnsup.cb = nullptr;
return rv;
}
}
mDnsup.serv->AsyncResolve(aHost, 0, this, mDnsup.thread, getter_AddRefs(mDnsup.mCancel));
return NS_OK;
}
NS_IMETHODIMP
Dashboard::OnLookupComplete(nsICancelable *aRequest, nsIDNSRecord *aRecord, nsresult aStatus)
{
AutoSafeJSContext cx;
mozilla::dom::DNSLookupDict dict;
dict.mAddress.Construct();
dict.mError.Construct();
dict.mAnswer.Construct();
Sequence<nsString> &addresses = dict.mAddress.Value();
nsString &error = dict.mError.Value();
bool &answer = dict.mAnswer.Value();
if (!NS_FAILED(aStatus)) {
answer = true;
bool hasMore;
aRecord->HasMore(&hasMore);
while(hasMore) {
nsCString nextAddress;
aRecord->GetNextAddrAsString(nextAddress);
CopyASCIItoUTF16(nextAddress, *addresses.AppendElement());
aRecord->HasMore(&hasMore);
}
} else {
answer = false;
CopyASCIItoUTF16(GetErrorString(aStatus), error);
}
JS::RootedValue val(cx);
if (!dict.ToObject(cx, JS::NullPtr(), &val)) {
mDnsup.cb = nullptr;
return NS_ERROR_FAILURE;
}
mDnsup.cb->OnDashboardDataAvailable(val);
mDnsup.cb = nullptr;
return NS_OK;
}
void
Dashboard::GetDnsInfoDispatch()
{
@ -530,6 +472,72 @@ Dashboard::GetDNSCacheEntries()
return NS_OK;
}
NS_IMETHODIMP
Dashboard::RequestDNSLookup(const nsACString &aHost, NetDashboardCallback *cb)
{
if (mDnsup.cb)
return NS_ERROR_FAILURE;
nsresult rv;
if (!mDnsup.serv) {
mDnsup.serv = do_GetService("@mozilla.org/network/dns-service;1", &rv);
if (NS_FAILED(rv))
return rv;
}
mDnsup.cb = cb;
rv = mDnsup.serv->AsyncResolve(aHost, 0, this, NS_GetCurrentThread(), getter_AddRefs(mDnsup.cancel));
if (NS_FAILED(rv)) {
mDnsup.cb = nullptr;
return rv;
}
return NS_OK;
}
NS_IMETHODIMP
Dashboard::OnLookupComplete(nsICancelable *aRequest, nsIDNSRecord *aRecord, nsresult aStatus)
{
MOZ_ASSERT(aRequest == mDnsup.cancel);
mDnsup.cancel = nullptr;
AutoSafeJSContext cx;
mozilla::dom::DNSLookupDict dict;
dict.mAddress.Construct();
dict.mError.Construct();
dict.mAnswer.Construct();
Sequence<nsString> &addresses = dict.mAddress.Value();
nsString &error = dict.mError.Value();
bool &answer = dict.mAnswer.Value();
if (NS_SUCCEEDED(aStatus)) {
answer = true;
bool hasMore;
aRecord->HasMore(&hasMore);
while(hasMore) {
nsCString nextAddress;
aRecord->GetNextAddrAsString(nextAddress);
CopyASCIItoUTF16(nextAddress, *addresses.AppendElement());
aRecord->HasMore(&hasMore);
}
} else {
answer = false;
CopyASCIItoUTF16(GetErrorString(aStatus), error);
}
JS::RootedValue val(cx);
if (!dict.ToObject(cx, JS::NullPtr(), &val)) {
mDnsup.cb = nullptr;
return NS_ERROR_FAILURE;
}
mDnsup.cb->OnDashboardDataAvailable(val);
mDnsup.cb = nullptr;
return NS_OK;
}
void
HttpConnInfo::SetHTTP1ProtocolVersion(uint8_t pv)
{

3
netwerk/base/src/Dashboard.h
View File

@ -125,9 +125,8 @@ private:
struct DnsLookup
{
nsCOMPtr<nsIDNSService> serv;
nsCOMPtr<nsICancelable> mCancel;
nsCOMPtr<nsICancelable> cancel;
nsCOMPtr<NetDashboardCallback> cb;
nsIThread* thread;
};
struct ConnectionData