зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1337893 - Part 1: Updating idl and ipdl files of DNS to make them originAttributes aware. r=valentin
MozReview-Commit-ID: 8ev5AU1GKo5 --HG-- extra : rebase_source : d501c3368fe101f0c8a9418627b277c1791718be
This commit is contained in:
Tim Huang
Родитель
97e0cc9666
Коммит
a36759a331
|
|
@ -11,6 +11,8 @@ include PDNSRequestParams;
|
|||
|
||||
include "mozilla/net/NeckoMessageUtils.h";
|
||||
|
||||
using mozilla::OriginAttributes from "mozilla/ipc/BackgroundUtils.h";
|
||||
|
||||
namespace mozilla {
|
||||
namespace net {
|
||||
|
||||
|
|
@ -23,8 +25,9 @@ parent:
|
|||
|
||||
// Pass args here rather than storing them in the parent; they are only
|
||||
// needed if the request is to be canceled.
|
||||
async CancelDNSRequest(nsCString hostName, uint32_t flags,
|
||||
nsCString networkInterface, nsresult reason);
|
||||
async CancelDNSRequest(nsCString hostName, OriginAttributes originAttributes,
|
||||
uint32_t flags, nsCString networkInterface,
|
||||
nsresult reason);
|
||||
async __delete__();
|
||||
|
||||
child:
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@
|
|||
|
||||
#include "nsISupports.idl"
|
||||
|
||||
%{ C++
|
||||
#include "mozilla/BasePrincipal.h"
|
||||
%}
|
||||
|
||||
interface nsICancelable;
|
||||
interface nsIEventTarget;
|
||||
interface nsIDNSRecord;
|
||||
|
|
@ -17,6 +21,7 @@ namespace mozilla { namespace net {
|
|||
%}
|
||||
|
||||
[ptr] native EntriesArray(nsTArray<mozilla::net::DNSCacheEntries>);
|
||||
[ref] native OriginAttributes(const mozilla::OriginAttributes);
|
||||
|
||||
/**
|
||||
* nsIDNSService
|
||||
|
|
@ -39,13 +44,27 @@ interface nsIDNSService : nsISupports
|
|||
* listener's onLookupComplete should be called. however, if this
|
||||
* parameter is null, then onLookupComplete will be called on an
|
||||
* unspecified thread (possibly recursively).
|
||||
* @param aOriginAttributes
|
||||
* the originAttribute for this resolving, the DNS cache will be
|
||||
* separated according to this originAttributes. This attribute is
|
||||
* optional to avoid breaking add-ons.
|
||||
*
|
||||
* @return An object that can be used to cancel the host lookup.
|
||||
*/
|
||||
[implicit_jscontext, optional_argc]
|
||||
nsICancelable asyncResolve(in AUTF8String aHostName,
|
||||
in unsigned long aFlags,
|
||||
in nsIDNSListener aListener,
|
||||
in nsIEventTarget aListenerTarget);
|
||||
in nsIEventTarget aListenerTarget,
|
||||
[optional] in jsval aOriginAttributes);
|
||||
|
||||
[notxpcom]
|
||||
nsresult asyncResolveNative(in AUTF8String aHostName,
|
||||
in unsigned long aFlags,
|
||||
in nsIDNSListener aListener,
|
||||
in nsIEventTarget aListenerTarget,
|
||||
in OriginAttributes aOriginAttributes,
|
||||
out nsICancelable aResult);
|
||||
|
||||
/**
|
||||
* Attempts to cancel a previously requested async DNS lookup
|
||||
|
|
@ -59,13 +78,25 @@ interface nsIDNSService : nsISupports
|
|||
* result - used to match request information to requestor.
|
||||
* @param aReason
|
||||
* nsresult reason for the cancellation
|
||||
* @param aOriginAttributes
|
||||
* the originAttribute for this resolving. This attribute is optional
|
||||
* to avoid breaking add-ons.
|
||||
*
|
||||
* @return An object that can be used to cancel the host lookup.
|
||||
*/
|
||||
[implicit_jscontext, optional_argc]
|
||||
void cancelAsyncResolve(in AUTF8String aHostName,
|
||||
in unsigned long aFlags,
|
||||
in nsIDNSListener aListener,
|
||||
in nsresult aReason);
|
||||
in nsresult aReason,
|
||||
[optional] in jsval aOriginAttributes);
|
||||
|
||||
[notxpcom]
|
||||
nsresult cancelAsyncResolveNative(in AUTF8String aHostName,
|
||||
in unsigned long aFlags,
|
||||
in nsIDNSListener aListener,
|
||||
in nsresult aReason,
|
||||
in OriginAttributes aOriginAttributes);
|
||||
|
||||
/**
|
||||
* called to synchronously resolve a hostname. warning this method may
|
||||
|
|
@ -76,12 +107,24 @@ interface nsIDNSService : nsISupports
|
|||
* the hostname or IP-address-literal to resolve.
|
||||
* @param aFlags
|
||||
* a bitwise OR of the RESOLVE_ prefixed constants defined below.
|
||||
* @param aOriginAttributes
|
||||
* the originAttribute for this resolving, the DNS cache will be
|
||||
* separated according to this originAttributes. This attribute is
|
||||
* optional to avoid breaking add-ons.
|
||||
*
|
||||
* @return DNS record corresponding to the given hostname.
|
||||
* @throws NS_ERROR_UNKNOWN_HOST if host could not be resolved.
|
||||
*/
|
||||
[implicit_jscontext, optional_argc]
|
||||
nsIDNSRecord resolve(in AUTF8String aHostName,
|
||||
in unsigned long aFlags);
|
||||
in unsigned long aFlags,
|
||||
[optional] in jsval aOriginAttributes);
|
||||
|
||||
[notxpcom]
|
||||
nsresult resolveNative(in AUTF8String aHostName,
|
||||
in unsigned long aFlags,
|
||||
in OriginAttributes aOriginAttributes,
|
||||
out nsIDNSRecord aResult);
|
||||
|
||||
/**
|
||||
* kicks off an asynchronous host lookup.
|
||||
|
|
@ -92,21 +135,42 @@ interface nsIDNSService : nsISupports
|
|||
* Setting aNetworkInterface value make only sense for gonk,because it
|
||||
* an per networking interface query is possible.
|
||||
*/
|
||||
[implicit_jscontext, optional_argc]
|
||||
nsICancelable asyncResolveExtended(in AUTF8String aHostName,
|
||||
in unsigned long aFlags,
|
||||
in AUTF8String aNetworkInterface,
|
||||
in nsIDNSListener aListener,
|
||||
in nsIEventTarget aListenerTarget);
|
||||
in nsIEventTarget aListenerTarget,
|
||||
[optional] in jsval aOriginAttributes);
|
||||
|
||||
[notxpcom]
|
||||
nsresult asyncResolveExtendedNative(in AUTF8String aHostName,
|
||||
in unsigned long aFlags,
|
||||
in AUTF8String aNetworkInterface,
|
||||
in nsIDNSListener aListener,
|
||||
in nsIEventTarget aListenerTarget,
|
||||
in OriginAttributes aOriginAttributes,
|
||||
out nsICancelable aResult);
|
||||
|
||||
/**
|
||||
* Attempts to cancel a previously requested async DNS lookup
|
||||
* This is an extended versin with a additional parameter aNetworkInterface
|
||||
*/
|
||||
[implicit_jscontext, optional_argc]
|
||||
void cancelAsyncResolveExtended(in AUTF8String aHostName,
|
||||
in unsigned long aFlags,
|
||||
in AUTF8String aNetworkInterface,
|
||||
in nsIDNSListener aListener,
|
||||
in nsresult aReason);
|
||||
in nsresult aReason,
|
||||
[optional] in jsval aOriginAttributes);
|
||||
|
||||
[notxpcom]
|
||||
nsresult cancelAsyncResolveExtendedNative(in AUTF8String aHostName,
|
||||
in unsigned long aFlags,
|
||||
in AUTF8String aNetworkInterface,
|
||||
in nsIDNSListener aListener,
|
||||
in nsresult aReason,
|
||||
in OriginAttributes aOriginAttributes);
|
||||
|
||||
/**
|
||||
* The method takes a pointer to an nsTArray
|
||||
|
|
|
|||
|
|
@ -76,7 +76,8 @@ parent:
|
|||
async PTCPServerSocket(uint16_t localPort, uint16_t backlog, bool useArrayBuffers);
|
||||
async PUDPSocket(Principal principal, nsCString filter);
|
||||
|
||||
async PDNSRequest(nsCString hostName, uint32_t flags, nsCString networkInterface);
|
||||
async PDNSRequest(nsCString hostName, OriginAttributes originAttributes,
|
||||
uint32_t flags, nsCString networkInterface);
|
||||
|
||||
async PWebSocketEventListener(uint64_t aInnerWindowID);
|
||||
|
||||
|
|
@ -89,8 +90,10 @@ parent:
|
|||
async PredReset();
|
||||
|
||||
async SpeculativeConnect(URIParams uri, Principal principal, bool anonymous);
|
||||
async HTMLDNSPrefetch(nsString hostname, uint16_t flags);
|
||||
async CancelHTMLDNSPrefetch(nsString hostname, uint16_t flags, nsresult reason);
|
||||
async HTMLDNSPrefetch(nsString hostname, OriginAttributes originAttributes,
|
||||
uint16_t flags);
|
||||
async CancelHTMLDNSPrefetch(nsString hostname, OriginAttributes originAttributes,
|
||||
uint16_t flags, nsresult reason);
|
||||
|
||||
/**
|
||||
* channelId is used to establish a connection between redirect channels in
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче