Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 286612 make socket interfaces scriptable, and remove some files that are not

Browse Source 
part of the build
r+sr=darin
This commit is contained in:
cbiesinger%web.de 2005-03-18 15:27:46 +00:00
parent 43bd760109
commit 0e2672a3b0
7 changed files with 9 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
netwerk/socket/base/nsISOCKS4SocketProvider.idl
View File

@ -1,48 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsISocketProvider.idl"
[noscript, uuid(F7C9F5F4-4451-41c3-A28A-5BA2447FBACE)]
interface nsISOCKS4SocketProvider : nsISocketProvider {
};
%{C++
#define NS_ISOCKS4SOCKETPROVIDER_CONTRACTID NS_NETWORK_SOCKET_CONTRACTID_PREFIX "socks4"
#define NS_ISOCKS4SOCKETPROVIDER_CLASSNAME "Mozilla SOCKS4 Socket Provider Component"
%}

8
netwerk/socket/base/nsISOCKSSocketInfo.idl
View File

@ -41,10 +41,10 @@
[ptr] native PRNetAddrPtr(union PRNetAddr);
[noscript, uuid(8f755c44-1dd2-11b2-a613-91117453fa95)]
[scriptable, uuid(8f755c44-1dd2-11b2-a613-91117453fa95)]
interface nsISOCKSSocketInfo : nsISupports
{
attribute PRNetAddrPtr destinationAddr;
attribute PRNetAddrPtr externalProxyAddr;
attribute PRNetAddrPtr internalProxyAddr;
[noscript] attribute PRNetAddrPtr destinationAddr;
[noscript] attribute PRNetAddrPtr externalProxyAddr;
[noscript] attribute PRNetAddrPtr internalProxyAddr;
};

49
netwerk/socket/base/nsISOCKSSocketProvider.idl
View File

@ -1,49 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Justin Bradford <jab@atdot.org>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsISocketProvider.idl"
[noscript, uuid(8dbe7246-1dd2-11b2-9b8f-b9a849e4403a)]
interface nsISOCKSSocketProvider : nsISocketProvider {
};
%{C++
#define NS_ISOCKSSOCKETPROVIDER_CONTRACTID NS_NETWORK_SOCKET_CONTRACTID_PREFIX "socks"
#define NS_ISOCKSSOCKETPROVIDER_CLASSNAME "Mozilla SOCKS Socket Provider Component"
%}

6
netwerk/socket/base/nsISocketProvider.idl
View File

@ -38,7 +38,7 @@
#include "nsISupports.idl"
[ptr] native nsFileDescStar(struct PRFileDesc);
[ptr] native PRFileDescStar(struct PRFileDesc);
/**
* nsISocketProvider
@ -73,7 +73,7 @@ interface nsISocketProvider : nsISupports
in string aProxyHost,
in long aProxyPort,
in unsigned long aFlags,
out nsFileDescStar aFileDesc,
out PRFileDescStar aFileDesc,
out nsISupports aSecurityInfo);
/**
@ -92,7 +92,7 @@ interface nsISocketProvider : nsISupports
in string aProxyHost,
in long aProxyPort,
in unsigned long aFlags,
in nsFileDescStar aFileDesc,
in PRFileDescStar aFileDesc,
out nsISupports aSecurityInfo);
/**

2
netwerk/socket/base/nsISocketProviderService.idl
View File

@ -45,7 +45,7 @@ interface nsISocketProvider;
* Provides a mapping between a socket type and its associated socket provider
* instance. One could also use the service manager directly.
*/
[noscript, uuid(8f8a23d0-5472-11d3-bbc8-0000861d1237)]
[scriptable, uuid(8f8a23d0-5472-11d3-bbc8-0000861d1237)]
interface nsISocketProviderService : nsISupports
{
nsISocketProvider getSocketProvider(in string socketType);

2
netwerk/socket/base/nsITransportSecurityInfo.idl
View File

@ -40,7 +40,7 @@
#include "nsISupports.idl"
[noscript, uuid(68e21b66-1dd2-11b2-aa67-e2b87175e792)]
[scriptable, uuid(68e21b66-1dd2-11b2-aa67-e2b87175e792)]
interface nsITransportSecurityInfo : nsISupports {
readonly attribute unsigned long securityState;
readonly attribute wstring shortSecurityDescription;

129
netwerk/socket/base/nsSOCKS4SocketProvider.cpp
View File

@ -1,129 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Justin Bradford <jab@atdot.org>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
#include "nsSOCKS4SocketProvider.h"
#include "nsSOCKSIOLayer.h"
//////////////////////////////////////////////////////////////////////////
nsSOCKS4SocketProvider::nsSOCKS4SocketProvider()
{
}
nsresult
nsSOCKS4SocketProvider::Init()
{
nsresult rv = NS_OK;
return rv;
}
nsSOCKS4SocketProvider::~nsSOCKS4SocketProvider()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS2(nsSOCKS4SocketProvider, nsISocketProvider, nsISOCKS4SocketProvider)
NS_METHOD
nsSOCKS4SocketProvider::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
{
nsresult rv;
nsSOCKS4SocketProvider * inst;
if (NULL == aResult) {
rv = NS_ERROR_NULL_POINTER;
return rv;
}
*aResult = NULL;
if (NULL != aOuter) {
rv = NS_ERROR_NO_AGGREGATION;
return rv;
}
NS_NEWXPCOM(inst, nsSOCKS4SocketProvider);
if (NULL == inst) {
rv = NS_ERROR_OUT_OF_MEMORY;
return rv;
}
NS_ADDREF(inst);
rv = inst->QueryInterface(aIID, aResult);
NS_RELEASE(inst);
return rv;
}
NS_IMETHODIMP
nsSOCKS4SocketProvider::NewSocket(const char *host,
PRInt32 port,
const char *proxyHost,
PRInt32 proxyPort,
PRFileDesc **_result,
nsISupports **socksInfo)
{
nsresult rv = nsSOCKSIOLayerNewSocket(host,
port,
proxyHost,
proxyPort,
4, // SOCKS 4
_result,
socksInfo);
return (NS_FAILED(rv)) ? NS_ERROR_SOCKET_CREATE_FAILED : NS_OK;
}
NS_IMETHODIMP
nsSOCKS4SocketProvider::AddToSocket(const char *host,
PRInt32 port,
const char *proxyHost,
PRInt32 proxyPort,
PRFileDesc *socket,
nsISupports **socksInfo)
{
nsresult rv = nsSOCKSIOLayerAddToSocket(host,
port,
proxyHost,
proxyPort,
4, // SOCKS 4
socket,
socksInfo);
return (NS_FAILED(rv)) ? NS_ERROR_SOCKET_CREATE_FAILED : NS_OK;
}