forked from mirrors/gecko-dev
3e439bb4f8
It's silly to use prmem.h within Firefox code given that in our configuration its functions are just wrappers for malloc() et al. (Indeed, in some places we mix PR_Malloc() with free(), or malloc() with PR_Free().) This patch removes all uses, except for the places where we need to use PR_Free() to free something allocated by another NSPR function; in those cases I've added a comment explaining which function did the allocation. --HG-- extra : rebase_source : 0f781bca68b5bf3c4c191e09e277dfc8becffa09
141 lines
3.8 KiB
C++
141 lines
3.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsISystemProxySettings.h"
|
|
#include "mozilla/ModuleUtils.h"
|
|
#include "nsIServiceManager.h"
|
|
#include "nsIURI.h"
|
|
#include "nsString.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsNetCID.h"
|
|
#include "nspr.h"
|
|
|
|
extern "C" {
|
|
#include <proxy.h>
|
|
}
|
|
|
|
class nsUnixSystemProxySettings : public nsISystemProxySettings {
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSISYSTEMPROXYSETTINGS
|
|
|
|
nsUnixSystemProxySettings() { mProxyFactory = nullptr; }
|
|
nsresult Init();
|
|
|
|
private:
|
|
~nsUnixSystemProxySettings() {
|
|
if (mProxyFactory)
|
|
px_proxy_factory_free(mProxyFactory);
|
|
}
|
|
|
|
pxProxyFactory *mProxyFactory;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings)
|
|
|
|
NS_IMETHODIMP
|
|
nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
|
|
{
|
|
*aMainThreadOnly = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsUnixSystemProxySettings::Init()
|
|
{
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsUnixSystemProxySettings::GetPACURI(nsACString& aResult)
|
|
{
|
|
// Make sure we return an empty result.
|
|
aResult.Truncate();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
|
|
const nsACString & aScheme,
|
|
const nsACString & aHost,
|
|
const int32_t aPort,
|
|
nsACString & aResult)
|
|
{
|
|
nsresult rv;
|
|
|
|
if (!mProxyFactory) {
|
|
mProxyFactory = px_proxy_factory_new();
|
|
}
|
|
NS_ENSURE_TRUE(mProxyFactory, NS_ERROR_NOT_AVAILABLE);
|
|
|
|
char **proxyArray = nullptr;
|
|
proxyArray = px_proxy_factory_get_proxies(mProxyFactory,
|
|
PromiseFlatCString(aSpec).get());
|
|
NS_ENSURE_TRUE(proxyArray, NS_ERROR_NOT_AVAILABLE);
|
|
|
|
// Translate libproxy's output to PAC string as expected
|
|
// libproxy returns an array of proxies in the format:
|
|
// <procotol>://[username:password@]proxy:port
|
|
// or
|
|
// direct://
|
|
//
|
|
// PAC format: "PROXY proxy1.foo.com:8080; PROXY proxy2.foo.com:8080; DIRECT"
|
|
// but nsISystemProxySettings allows "PROXY http://proxy.foo.com:8080" as well.
|
|
|
|
int c = 0;
|
|
while (proxyArray[c] != nullptr) {
|
|
if (!aResult.IsEmpty()) {
|
|
aResult.AppendLiteral("; ");
|
|
}
|
|
|
|
// figure out the scheme, and we can't use nsIIOService::NewURI because
|
|
// this is not the main thread.
|
|
char *colon = strchr (proxyArray[c], ':');
|
|
uint32_t schemelen = colon ? colon - proxyArray[c] : 0;
|
|
if (schemelen < 1) {
|
|
c++;
|
|
continue;
|
|
}
|
|
|
|
if (schemelen == 6 && !strncasecmp(proxyArray[c], "direct", 6)) {
|
|
aResult.AppendLiteral("DIRECT");
|
|
}
|
|
else {
|
|
aResult.AppendLiteral("PROXY ");
|
|
aResult.Append(proxyArray[c]);
|
|
}
|
|
|
|
c++;
|
|
}
|
|
|
|
free(proxyArray);
|
|
return NS_OK;
|
|
}
|
|
|
|
#define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\
|
|
{ 0x0fa3158c, 0xd5a7, 0x43de, \
|
|
{0x91, 0x81, 0xa2, 0x85, 0xe7, 0x4c, 0xf1, 0xd4 } }
|
|
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixSystemProxySettings, Init)
|
|
NS_DEFINE_NAMED_CID(NS_UNIXSYSTEMPROXYSERVICE_CID);
|
|
|
|
static const mozilla::Module::CIDEntry kUnixProxyCIDs[] = {
|
|
{ &kNS_UNIXSYSTEMPROXYSERVICE_CID, false, nullptr, nsUnixSystemProxySettingsConstructor },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module::ContractIDEntry kUnixProxyContracts[] = {
|
|
{ NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_UNIXSYSTEMPROXYSERVICE_CID },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module kUnixProxyModule = {
|
|
mozilla::Module::kVersion,
|
|
kUnixProxyCIDs,
|
|
kUnixProxyContracts
|
|
};
|
|
|
|
NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
|
|
|