Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OS (for example against Windows Active-Directory via IAS).</description>
<date>2016-02-15</date>
<time>15:11:50</time>
<version>
<release>1.4.0b1</release>
<release>1.4.1</release>
<api>1.4.0b1</api>
</version>
<stability>
Expand All @@ -44,11 +44,11 @@ OS (for example against Windows Active-Directory via IAS).</description>
<file md5sum="86285d20163dd259ed7823d8fac9dfe4" name="pecl-compat/src/misc.h" role="src" />
<file md5sum="bd2b4fe3b4c053a338a24efb66a37a18" name="pecl-compat/src/zend_API.h" role="src" />
<file md5sum="e78c79ee5dfe4622879debc788923a2b" name="pecl-compat/src/zend_hash.h" role="src" />
<file md5sum="61244e4767158ab5559888a1ace59caf" name="pecl-compat/src/zend_resource.h" role="src" />
<file md5sum="f9453833dbc7987d745ab72028dd1fb9" name="pecl-compat/src/zend_resource.h" role="src" />
<file md5sum="4964d5e75b79e45810cb5e3af061f70c" name="pecl-compat/src/zend_string.h" role="src" />
<file md5sum="4ca10b620178ce5619fdb2985e99ebc9" name="pecl-compat/compat.h" role="src" />
<file md5sum="0d3e00de3884c815b833b0caeb2c4bc6" name="pecl-compat/compat.h" role="src" />
<file md5sum="2df3b9f9a4750e44c0063e90916ea745" name="tests/server/attribute.php" role="test" />
<file md5sum="2c80246c2caaa10c3996220e7fc8f375" name="tests/server/fake_server.php" role="test" />
<file md5sum="929708eb4c6f810b3b72443dd86d8779" name="tests/server/fake_server.php" role="test" />
<file md5sum="21ef8d92199a91103fe752d72fa99eb1" name="tests/server/vsa.php" role="test" />
<file md5sum="48b924771a69fd92f46273fcae8fd187" name="tests/coa.phpt" role="test" />
<file md5sum="a9c62a0245dda571c869b3c87371d983" name="tests/disconnect.phpt" role="test" />
Expand Down Expand Up @@ -87,13 +87,15 @@ OS (for example against Windows Active-Directory via IAS).</description>
<file md5sum="9ab005d49da8ea33b4fddb62a7ba374c" name="CREDITS" role="doc" />
<file md5sum="1e50d4afb32d20d3c990cb41976da9ab" name="LICENSE" role="doc" />
<file md5sum="9e30411dec8d2c49b771d48750927202" name="Makefile.in" role="src" />
<file md5sum="5e9da3f2158123abf6833d9c5ad50418" name="php_radius.h" role="src" />
<file md5sum="ac38fdd33abdfea8bbf02917c1d02e3b" name="radius.c" role="src" />
<file md5sum="4a35d69c110ce81beaf81b5dc99de6e7" name="php_radius.h" role="src" />
<file md5sum="744958c7f63eaf79ba2c4ab078962a54" name="radius.c" role="src" />
<file md5sum="32314145ab4a36966dade15c2261a51a" name="radius.conf" role="src" />
<file md5sum="a01a9e5453ddccebc5efe87099c24b73" name="radius.dsp" role="src" />
<file md5sum="c7b1fcf55179bf615e35742eb3f3769c" name="radius.dsw" role="src" />
<file md5sum="bc43e393a7c2a747b5964a9c5aee0d8c" name="radius_init_const.h" role="src" />
<file md5sum="3feafe670018cb923a827b620e641116" name="radlib.c" role="src" />
<file md5sum="6e6ce06e61b2b9779893564a064dc88a" name="radius.stub.php" role="src" />
<file md5sum="ad5e48b3d617fa1a0d202c734c452a13" name="radius_arginfo.h" role="src" />
<file md5sum="36c53a14ca9a0f2f5011cf36abfc8c03" name="radius_init_const.h" role="src" />
<file md5sum="68dc04d9d1597ad40da0960b58c34c4b" name="radlib.c" role="src" />
<file md5sum="67315cdd8a1fb01f714a0fe66e6ae9ea" name="radlib.h" role="src" />
<file md5sum="732ba9cd1657b19cd8479fc1e7081249" name="radlib_compat.c" role="src" />
<file md5sum="22c192f920625f529a77d79df529d185" name="radlib_compat.h" role="src" />
Expand Down
2 changes: 1 addition & 1 deletion php_radius.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ any other GPL-like (LGPL, GPL2) License.

#define phpext_radius_ptr &radius_module_entry

#define PHP_RADIUS_VERSION "1.4.0b1"
#define PHP_RADIUS_VERSION "1.4.1"

#ifdef PHP_WIN32
#define PHP_RADIUS_API __declspec(dllexport)
Expand Down
199 changes: 2 additions & 197 deletions radius.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,202 +68,7 @@ ZEND_DECLARE_MODULE_GLOBALS(radius)
/* True global resources - no need for thread safety here */
static int le_radius;

/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_auth_open, 0, 0, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_acct_open, 0, 0, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_close, 0, 0, 1)
ZEND_ARG_INFO(0, radius_handle)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_strerror, 0, 0, 1)
ZEND_ARG_INFO(0, radius_handle)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_config, 0, 0, 2)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, file)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_add_server, 0, 0, 6)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, hostname)
ZEND_ARG_INFO(0, port)
ZEND_ARG_INFO(0, secret)
ZEND_ARG_INFO(0, timeout)
ZEND_ARG_INFO(0, max_tries)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_create_request, 0, 0, 2)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, type)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_string, 0, 0, 3)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, type)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, options)
ZEND_ARG_INFO(0, tag)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_int, 0, 0, 3)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, type)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, options)
ZEND_ARG_INFO(0, tag)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_attr, 0, 0, 3)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, type)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, options)
ZEND_ARG_INFO(0, tag)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_addr, 0, 0, 3)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, type)
ZEND_ARG_INFO(0, addr)
ZEND_ARG_INFO(0, options)
ZEND_ARG_INFO(0, tag)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_string, 0, 0, 4)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, vendor)
ZEND_ARG_INFO(0, type)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, options)
ZEND_ARG_INFO(0, tag)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_int, 0, 0, 4)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, vendor)
ZEND_ARG_INFO(0, type)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, options)
ZEND_ARG_INFO(0, tag)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_attr, 0, 0, 4)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, vendor)
ZEND_ARG_INFO(0, type)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, options)
ZEND_ARG_INFO(0, tag)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_addr, 0, 0, 4)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, vendor)
ZEND_ARG_INFO(0, type)
ZEND_ARG_INFO(0, addr)
ZEND_ARG_INFO(0, options)
ZEND_ARG_INFO(0, tag)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_send_request, 0, 0, 1)
ZEND_ARG_INFO(0, radius_handle)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_attr, 0, 0, 1)
ZEND_ARG_INFO(0, radius_handle)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_tagged_attr_data, 0, 0, 1)
ZEND_ARG_INFO(0, data)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_tagged_attr_tag, 0, 0, 1)
ZEND_ARG_INFO(0, data)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_vendor_attr, 0, 0, 1)
ZEND_ARG_INFO(0, data)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_cvt_addr, 0, 0, 1)
ZEND_ARG_INFO(0, data)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_cvt_int, 0, 0, 1)
ZEND_ARG_INFO(0, data)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_cvt_string, 0, 0, 1)
ZEND_ARG_INFO(0, data)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_salt_encrypt_attr, 0, 0, 2)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, data)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_request_authenticator, 0, 0, 1)
ZEND_ARG_INFO(0, radius_handle)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_server_secret, 0, 0, 1)
ZEND_ARG_INFO(0, radius_handle)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_demangle, 0, 0, 2)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, mangled)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_demangle_mppe_key, 0, 0, 2)
ZEND_ARG_INFO(0, radius_handle)
ZEND_ARG_INFO(0, mangled)
ZEND_END_ARG_INFO()

/* }}} */


/* {{{ radius_functions[]
*
* Every user visible function must have an entry in radius_functions[].
*/
zend_function_entry radius_functions[] = {
PHP_FE(radius_auth_open, arginfo_radius_auth_open)
PHP_FE(radius_acct_open, arginfo_radius_acct_open)
PHP_FE(radius_close, arginfo_radius_close)
PHP_FE(radius_strerror, arginfo_radius_strerror)
PHP_FE(radius_config, arginfo_radius_config)
PHP_FE(radius_add_server, arginfo_radius_add_server)
PHP_FE(radius_create_request, arginfo_radius_create_request)
PHP_FE(radius_put_string, arginfo_radius_put_string)
PHP_FE(radius_put_int, arginfo_radius_put_int)
PHP_FE(radius_put_attr, arginfo_radius_put_attr)
PHP_FE(radius_put_addr, arginfo_radius_put_addr)
PHP_FE(radius_put_vendor_string, arginfo_radius_put_vendor_string)
PHP_FE(radius_put_vendor_int, arginfo_radius_put_vendor_int)
PHP_FE(radius_put_vendor_attr, arginfo_radius_put_vendor_attr)
PHP_FE(radius_put_vendor_addr, arginfo_radius_put_vendor_addr)
PHP_FE(radius_send_request, arginfo_radius_get_attr)
PHP_FE(radius_get_attr, arginfo_radius_get_attr)
PHP_FE(radius_get_tagged_attr_data, arginfo_radius_get_tagged_attr_data)
PHP_FE(radius_get_tagged_attr_tag, arginfo_radius_get_tagged_attr_tag)
PHP_FE(radius_get_vendor_attr, arginfo_radius_get_vendor_attr)
PHP_FE(radius_cvt_addr, arginfo_radius_cvt_addr)
PHP_FE(radius_cvt_int, arginfo_radius_cvt_int)
PHP_FE(radius_cvt_string, arginfo_radius_cvt_string)
PHP_FE(radius_salt_encrypt_attr, arginfo_radius_salt_encrypt_attr)
PHP_FE(radius_request_authenticator, arginfo_radius_request_authenticator)
PHP_FE(radius_server_secret, arginfo_radius_server_secret)
PHP_FE(radius_demangle, arginfo_radius_demangle)
PHP_FE(radius_demangle_mppe_key, arginfo_radius_demangle_mppe_key)
{NULL, NULL, NULL} /* Must be the last line in radius_functions[] */
};
/* }}} */
#include "radius_arginfo.h"

/* {{{ radius_module_entry
*/
Expand All @@ -272,7 +77,7 @@ zend_module_entry radius_module_entry = {
STANDARD_MODULE_HEADER,
#endif
"radius",
radius_functions,
ext_functions,
PHP_MINIT(radius),
PHP_MSHUTDOWN(radius),
NULL,
Expand Down
126 changes: 126 additions & 0 deletions radius.stub.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<?php

/** @generate-function-entries */

/**
* @return resource|false
*/
function radius_acct_open ( ) {}

/**
* @param resource $radius_handle
*/
function radius_add_server ( $radius_handle , string $hostname , int $port , string $secret , int $timeout , int $max_tries ) : bool {}

/**
* @return resource|false
*/
function radius_auth_open ( ) {}

/**
* @param resource $radius_handle
*/
function radius_close ( $radius_handle ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_config ( $radius_handle , string $file ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_create_request ( $radius_handle , int $type ) : bool {}

function radius_cvt_addr ( string $data ) : string {}

function radius_cvt_int ( string $data ) : int {}

function radius_cvt_string ( string $data ) : string {}

/**
* @param resource $radius_handle
*/
function radius_demangle_mppe_key ( $radius_handle , string $mangled ) : string|false {}

/**
* @param resource $radius_handle
*/
function radius_demangle ( $radius_handle , string $mangled ) : string|false {}

/**
* @param resource $radius_handle
*/
function radius_get_attr ( $radius_handle ) : array|int {}

function radius_get_tagged_attr_data ( string $data ) : string|false {}

function radius_get_tagged_attr_tag ( string $data ) : int|false {}

function radius_get_vendor_attr ( string $data ) : array|false {}

/**
* @param resource $radius_handle
*/
function radius_put_addr ( $radius_handle , int $type , string $address , ?int $options = 0 , int $tag = 0 ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_put_attr ( $radius_handle , int $type , string $value , ?int $options = 0 , int $tag = 0 ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_put_int ( $radius_handle , int $type , int $value , ?int $options = 0 , int $tag = 0 ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_put_string ( $radius_handle , int $type , string $value , ?int $options = 0 , int $tag = 0 ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_put_vendor_addr ( $radius_handle , int $vendor , int $type , string $address ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_put_vendor_attr ( $radius_handle , int $vendor , int $type , string $value , ?int $options = 0 , int $tag = 0 ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_put_vendor_int ( $radius_handle , int $vendor , int $type , int $value , ?int $options = 0 , int $tag = 0 ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_put_vendor_string ( $radius_handle , int $vendor , int $type , string $value , ?int $options = 0 , int $tag = 0 ) : bool {}

/**
* @param resource $radius_handle
*/
function radius_request_authenticator ( $radius_handle ) : string|false {}

/**
* @param resource $radius_handle
*/
function radius_salt_encrypt_attr ( $radius_handle , string $data ) : string|false {}

/**
* @param resource $radius_handle
*/
function radius_send_request ( $radius_handle ) : int|false {}

/**
* @param resource $radius_handle
*/
function radius_server_secret ( $radius_handle ) : string {}

/**
* @param resource $radius_handle
*/
function radius_strerror ( $radius_handle ) : string {}

Loading