Skip to content

Commit b733707

Browse files
StephenWallStephenWall
committed
Add stub file for populating arginfo, update version
1 parent 9213102 commit b733707

5 files changed

Lines changed: 337 additions & 206 deletions

File tree

‎package.xml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ OS (for example against Windows Active-Directory via IAS).</description>
2222
<date>2016-02-15</date>
2323
<time>15:11:50</time>
2424
<version>
25-
<release>1.4.0b1</release>
25+
<release>1.4.1</release>
2626
<api>1.4.0b1</api>
2727
</version>
2828
<stability>
@@ -44,11 +44,11 @@ OS (for example against Windows Active-Directory via IAS).</description>
4444
<file md5sum="86285d20163dd259ed7823d8fac9dfe4" name="pecl-compat/src/misc.h" role="src" />
4545
<file md5sum="bd2b4fe3b4c053a338a24efb66a37a18" name="pecl-compat/src/zend_API.h" role="src" />
4646
<file md5sum="e78c79ee5dfe4622879debc788923a2b" name="pecl-compat/src/zend_hash.h" role="src" />
47-
<file md5sum="61244e4767158ab5559888a1ace59caf" name="pecl-compat/src/zend_resource.h" role="src" />
47+
<file md5sum="f9453833dbc7987d745ab72028dd1fb9" name="pecl-compat/src/zend_resource.h" role="src" />
4848
<file md5sum="4964d5e75b79e45810cb5e3af061f70c" name="pecl-compat/src/zend_string.h" role="src" />
49-
<file md5sum="4ca10b620178ce5619fdb2985e99ebc9" name="pecl-compat/compat.h" role="src" />
49+
<file md5sum="0d3e00de3884c815b833b0caeb2c4bc6" name="pecl-compat/compat.h" role="src" />
5050
<file md5sum="2df3b9f9a4750e44c0063e90916ea745" name="tests/server/attribute.php" role="test" />
51-
<file md5sum="2c80246c2caaa10c3996220e7fc8f375" name="tests/server/fake_server.php" role="test" />
51+
<file md5sum="929708eb4c6f810b3b72443dd86d8779" name="tests/server/fake_server.php" role="test" />
5252
<file md5sum="21ef8d92199a91103fe752d72fa99eb1" name="tests/server/vsa.php" role="test" />
5353
<file md5sum="48b924771a69fd92f46273fcae8fd187" name="tests/coa.phpt" role="test" />
5454
<file md5sum="a9c62a0245dda571c869b3c87371d983" name="tests/disconnect.phpt" role="test" />
@@ -87,13 +87,15 @@ OS (for example against Windows Active-Directory via IAS).</description>
8787
<file md5sum="9ab005d49da8ea33b4fddb62a7ba374c" name="CREDITS" role="doc" />
8888
<file md5sum="1e50d4afb32d20d3c990cb41976da9ab" name="LICENSE" role="doc" />
8989
<file md5sum="9e30411dec8d2c49b771d48750927202" name="Makefile.in" role="src" />
90-
<file md5sum="5e9da3f2158123abf6833d9c5ad50418" name="php_radius.h" role="src" />
91-
<file md5sum="ac38fdd33abdfea8bbf02917c1d02e3b" name="radius.c" role="src" />
90+
<file md5sum="4a35d69c110ce81beaf81b5dc99de6e7" name="php_radius.h" role="src" />
91+
<file md5sum="744958c7f63eaf79ba2c4ab078962a54" name="radius.c" role="src" />
9292
<file md5sum="32314145ab4a36966dade15c2261a51a" name="radius.conf" role="src" />
9393
<file md5sum="a01a9e5453ddccebc5efe87099c24b73" name="radius.dsp" role="src" />
9494
<file md5sum="c7b1fcf55179bf615e35742eb3f3769c" name="radius.dsw" role="src" />
95-
<file md5sum="bc43e393a7c2a747b5964a9c5aee0d8c" name="radius_init_const.h" role="src" />
96-
<file md5sum="3feafe670018cb923a827b620e641116" name="radlib.c" role="src" />
95+
<file md5sum="6e6ce06e61b2b9779893564a064dc88a" name="radius.stub.php" role="src" />
96+
<file md5sum="ad5e48b3d617fa1a0d202c734c452a13" name="radius_arginfo.h" role="src" />
97+
<file md5sum="36c53a14ca9a0f2f5011cf36abfc8c03" name="radius_init_const.h" role="src" />
98+
<file md5sum="68dc04d9d1597ad40da0960b58c34c4b" name="radlib.c" role="src" />
9799
<file md5sum="67315cdd8a1fb01f714a0fe66e6ae9ea" name="radlib.h" role="src" />
98100
<file md5sum="732ba9cd1657b19cd8479fc1e7081249" name="radlib_compat.c" role="src" />
99101
<file md5sum="22c192f920625f529a77d79df529d185" name="radlib_compat.h" role="src" />

‎php_radius.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ any other GPL-like (LGPL, GPL2) License.
3939

4040
#define phpext_radius_ptr &radius_module_entry
4141

42-
#define PHP_RADIUS_VERSION "1.4.0b1"
42+
#define PHP_RADIUS_VERSION "1.4.1"
4343

4444
#ifdef PHP_WIN32
4545
#define PHP_RADIUS_API __declspec(dllexport)

‎radius.c‎

Lines changed: 2 additions & 197 deletions
Original file line numberDiff line numberDiff line change
@@ -68,202 +68,7 @@ ZEND_DECLARE_MODULE_GLOBALS(radius)
6868
/* True global resources - no need for thread safety here */
6969
static int le_radius;
7070

71-
/* {{{ arginfo */
72-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_auth_open, 0, 0, 0)
73-
ZEND_END_ARG_INFO()
74-
75-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_acct_open, 0, 0, 0)
76-
ZEND_END_ARG_INFO()
77-
78-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_close, 0, 0, 1)
79-
ZEND_ARG_INFO(0, radius_handle)
80-
ZEND_END_ARG_INFO()
81-
82-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_strerror, 0, 0, 1)
83-
ZEND_ARG_INFO(0, radius_handle)
84-
ZEND_END_ARG_INFO()
85-
86-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_config, 0, 0, 2)
87-
ZEND_ARG_INFO(0, radius_handle)
88-
ZEND_ARG_INFO(0, file)
89-
ZEND_END_ARG_INFO()
90-
91-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_add_server, 0, 0, 6)
92-
ZEND_ARG_INFO(0, radius_handle)
93-
ZEND_ARG_INFO(0, hostname)
94-
ZEND_ARG_INFO(0, port)
95-
ZEND_ARG_INFO(0, secret)
96-
ZEND_ARG_INFO(0, timeout)
97-
ZEND_ARG_INFO(0, max_tries)
98-
ZEND_END_ARG_INFO()
99-
100-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_create_request, 0, 0, 2)
101-
ZEND_ARG_INFO(0, radius_handle)
102-
ZEND_ARG_INFO(0, type)
103-
ZEND_END_ARG_INFO()
104-
105-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_string, 0, 0, 3)
106-
ZEND_ARG_INFO(0, radius_handle)
107-
ZEND_ARG_INFO(0, type)
108-
ZEND_ARG_INFO(0, value)
109-
ZEND_ARG_INFO(0, options)
110-
ZEND_ARG_INFO(0, tag)
111-
ZEND_END_ARG_INFO()
112-
113-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_int, 0, 0, 3)
114-
ZEND_ARG_INFO(0, radius_handle)
115-
ZEND_ARG_INFO(0, type)
116-
ZEND_ARG_INFO(0, value)
117-
ZEND_ARG_INFO(0, options)
118-
ZEND_ARG_INFO(0, tag)
119-
ZEND_END_ARG_INFO()
120-
121-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_attr, 0, 0, 3)
122-
ZEND_ARG_INFO(0, radius_handle)
123-
ZEND_ARG_INFO(0, type)
124-
ZEND_ARG_INFO(0, value)
125-
ZEND_ARG_INFO(0, options)
126-
ZEND_ARG_INFO(0, tag)
127-
ZEND_END_ARG_INFO()
128-
129-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_addr, 0, 0, 3)
130-
ZEND_ARG_INFO(0, radius_handle)
131-
ZEND_ARG_INFO(0, type)
132-
ZEND_ARG_INFO(0, addr)
133-
ZEND_ARG_INFO(0, options)
134-
ZEND_ARG_INFO(0, tag)
135-
ZEND_END_ARG_INFO()
136-
137-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_string, 0, 0, 4)
138-
ZEND_ARG_INFO(0, radius_handle)
139-
ZEND_ARG_INFO(0, vendor)
140-
ZEND_ARG_INFO(0, type)
141-
ZEND_ARG_INFO(0, value)
142-
ZEND_ARG_INFO(0, options)
143-
ZEND_ARG_INFO(0, tag)
144-
ZEND_END_ARG_INFO()
145-
146-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_int, 0, 0, 4)
147-
ZEND_ARG_INFO(0, radius_handle)
148-
ZEND_ARG_INFO(0, vendor)
149-
ZEND_ARG_INFO(0, type)
150-
ZEND_ARG_INFO(0, value)
151-
ZEND_ARG_INFO(0, options)
152-
ZEND_ARG_INFO(0, tag)
153-
ZEND_END_ARG_INFO()
154-
155-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_attr, 0, 0, 4)
156-
ZEND_ARG_INFO(0, radius_handle)
157-
ZEND_ARG_INFO(0, vendor)
158-
ZEND_ARG_INFO(0, type)
159-
ZEND_ARG_INFO(0, value)
160-
ZEND_ARG_INFO(0, options)
161-
ZEND_ARG_INFO(0, tag)
162-
ZEND_END_ARG_INFO()
163-
164-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_addr, 0, 0, 4)
165-
ZEND_ARG_INFO(0, radius_handle)
166-
ZEND_ARG_INFO(0, vendor)
167-
ZEND_ARG_INFO(0, type)
168-
ZEND_ARG_INFO(0, addr)
169-
ZEND_ARG_INFO(0, options)
170-
ZEND_ARG_INFO(0, tag)
171-
ZEND_END_ARG_INFO()
172-
173-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_send_request, 0, 0, 1)
174-
ZEND_ARG_INFO(0, radius_handle)
175-
ZEND_END_ARG_INFO()
176-
177-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_attr, 0, 0, 1)
178-
ZEND_ARG_INFO(0, radius_handle)
179-
ZEND_END_ARG_INFO()
180-
181-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_tagged_attr_data, 0, 0, 1)
182-
ZEND_ARG_INFO(0, data)
183-
ZEND_END_ARG_INFO()
184-
185-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_tagged_attr_tag, 0, 0, 1)
186-
ZEND_ARG_INFO(0, data)
187-
ZEND_END_ARG_INFO()
188-
189-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_vendor_attr, 0, 0, 1)
190-
ZEND_ARG_INFO(0, data)
191-
ZEND_END_ARG_INFO()
192-
193-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_cvt_addr, 0, 0, 1)
194-
ZEND_ARG_INFO(0, data)
195-
ZEND_END_ARG_INFO()
196-
197-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_cvt_int, 0, 0, 1)
198-
ZEND_ARG_INFO(0, data)
199-
ZEND_END_ARG_INFO()
200-
201-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_cvt_string, 0, 0, 1)
202-
ZEND_ARG_INFO(0, data)
203-
ZEND_END_ARG_INFO()
204-
205-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_salt_encrypt_attr, 0, 0, 2)
206-
ZEND_ARG_INFO(0, radius_handle)
207-
ZEND_ARG_INFO(0, data)
208-
ZEND_END_ARG_INFO()
209-
210-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_request_authenticator, 0, 0, 1)
211-
ZEND_ARG_INFO(0, radius_handle)
212-
ZEND_END_ARG_INFO()
213-
214-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_server_secret, 0, 0, 1)
215-
ZEND_ARG_INFO(0, radius_handle)
216-
ZEND_END_ARG_INFO()
217-
218-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_demangle, 0, 0, 2)
219-
ZEND_ARG_INFO(0, radius_handle)
220-
ZEND_ARG_INFO(0, mangled)
221-
ZEND_END_ARG_INFO()
222-
223-
ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_demangle_mppe_key, 0, 0, 2)
224-
ZEND_ARG_INFO(0, radius_handle)
225-
ZEND_ARG_INFO(0, mangled)
226-
ZEND_END_ARG_INFO()
227-
228-
/* }}} */
229-
230-
231-
/* {{{ radius_functions[]
232-
*
233-
* Every user visible function must have an entry in radius_functions[].
234-
*/
235-
zend_function_entry radius_functions[] = {
236-
PHP_FE(radius_auth_open, arginfo_radius_auth_open)
237-
PHP_FE(radius_acct_open, arginfo_radius_acct_open)
238-
PHP_FE(radius_close, arginfo_radius_close)
239-
PHP_FE(radius_strerror, arginfo_radius_strerror)
240-
PHP_FE(radius_config, arginfo_radius_config)
241-
PHP_FE(radius_add_server, arginfo_radius_add_server)
242-
PHP_FE(radius_create_request, arginfo_radius_create_request)
243-
PHP_FE(radius_put_string, arginfo_radius_put_string)
244-
PHP_FE(radius_put_int, arginfo_radius_put_int)
245-
PHP_FE(radius_put_attr, arginfo_radius_put_attr)
246-
PHP_FE(radius_put_addr, arginfo_radius_put_addr)
247-
PHP_FE(radius_put_vendor_string, arginfo_radius_put_vendor_string)
248-
PHP_FE(radius_put_vendor_int, arginfo_radius_put_vendor_int)
249-
PHP_FE(radius_put_vendor_attr, arginfo_radius_put_vendor_attr)
250-
PHP_FE(radius_put_vendor_addr, arginfo_radius_put_vendor_addr)
251-
PHP_FE(radius_send_request, arginfo_radius_get_attr)
252-
PHP_FE(radius_get_attr, arginfo_radius_get_attr)
253-
PHP_FE(radius_get_tagged_attr_data, arginfo_radius_get_tagged_attr_data)
254-
PHP_FE(radius_get_tagged_attr_tag, arginfo_radius_get_tagged_attr_tag)
255-
PHP_FE(radius_get_vendor_attr, arginfo_radius_get_vendor_attr)
256-
PHP_FE(radius_cvt_addr, arginfo_radius_cvt_addr)
257-
PHP_FE(radius_cvt_int, arginfo_radius_cvt_int)
258-
PHP_FE(radius_cvt_string, arginfo_radius_cvt_string)
259-
PHP_FE(radius_salt_encrypt_attr, arginfo_radius_salt_encrypt_attr)
260-
PHP_FE(radius_request_authenticator, arginfo_radius_request_authenticator)
261-
PHP_FE(radius_server_secret, arginfo_radius_server_secret)
262-
PHP_FE(radius_demangle, arginfo_radius_demangle)
263-
PHP_FE(radius_demangle_mppe_key, arginfo_radius_demangle_mppe_key)
264-
{NULL, NULL, NULL} /* Must be the last line in radius_functions[] */
265-
};
266-
/* }}} */
71+
#include "radius_arginfo.h"
26772

26873
/* {{{ radius_module_entry
26974
*/
@@ -272,7 +77,7 @@ zend_module_entry radius_module_entry = {
27277
STANDARD_MODULE_HEADER,
27378
#endif
27479
"radius",
275-
radius_functions,
80+
ext_functions,
27681
PHP_MINIT(radius),
27782
PHP_MSHUTDOWN(radius),
27883
NULL,

‎radius.stub.php‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<?php
2+
3+
/** @generate-function-entries */
4+
5+
/**
6+
* @return resource|false
7+
*/
8+
function radius_acct_open ( ) {}
9+
10+
/**
11+
* @param resource $radius_handle
12+
*/
13+
function radius_add_server ( $radius_handle , string $hostname , int $port , string $secret , int $timeout , int $max_tries ) : bool {}
14+
15+
/**
16+
* @return resource|false
17+
*/
18+
function radius_auth_open ( ) {}
19+
20+
/**
21+
* @param resource $radius_handle
22+
*/
23+
function radius_close ( $radius_handle ) : bool {}
24+
25+
/**
26+
* @param resource $radius_handle
27+
*/
28+
function radius_config ( $radius_handle , string $file ) : bool {}
29+
30+
/**
31+
* @param resource $radius_handle
32+
*/
33+
function radius_create_request ( $radius_handle , int $type ) : bool {}
34+
35+
function radius_cvt_addr ( string $data ) : string {}
36+
37+
function radius_cvt_int ( string $data ) : int {}
38+
39+
function radius_cvt_string ( string $data ) : string {}
40+
41+
/**
42+
* @param resource $radius_handle
43+
*/
44+
function radius_demangle_mppe_key ( $radius_handle , string $mangled ) : string|false {}
45+
46+
/**
47+
* @param resource $radius_handle
48+
*/
49+
function radius_demangle ( $radius_handle , string $mangled ) : string|false {}
50+
51+
/**
52+
* @param resource $radius_handle
53+
*/
54+
function radius_get_attr ( $radius_handle ) : array|int {}
55+
56+
function radius_get_tagged_attr_data ( string $data ) : string|false {}
57+
58+
function radius_get_tagged_attr_tag ( string $data ) : int|false {}
59+
60+
function radius_get_vendor_attr ( string $data ) : array|false {}
61+
62+
/**
63+
* @param resource $radius_handle
64+
*/
65+
function radius_put_addr ( $radius_handle , int $type , string $address , ?int $options = 0 , int $tag = 0 ) : bool {}
66+
67+
/**
68+
* @param resource $radius_handle
69+
*/
70+
function radius_put_attr ( $radius_handle , int $type , string $value , ?int $options = 0 , int $tag = 0 ) : bool {}
71+
72+
/**
73+
* @param resource $radius_handle
74+
*/
75+
function radius_put_int ( $radius_handle , int $type , int $value , ?int $options = 0 , int $tag = 0 ) : bool {}
76+
77+
/**
78+
* @param resource $radius_handle
79+
*/
80+
function radius_put_string ( $radius_handle , int $type , string $value , ?int $options = 0 , int $tag = 0 ) : bool {}
81+
82+
/**
83+
* @param resource $radius_handle
84+
*/
85+
function radius_put_vendor_addr ( $radius_handle , int $vendor , int $type , string $address ) : bool {}
86+
87+
/**
88+
* @param resource $radius_handle
89+
*/
90+
function radius_put_vendor_attr ( $radius_handle , int $vendor , int $type , string $value , ?int $options = 0 , int $tag = 0 ) : bool {}
91+
92+
/**
93+
* @param resource $radius_handle
94+
*/
95+
function radius_put_vendor_int ( $radius_handle , int $vendor , int $type , int $value , ?int $options = 0 , int $tag = 0 ) : bool {}
96+
97+
/**
98+
* @param resource $radius_handle
99+
*/
100+
function radius_put_vendor_string ( $radius_handle , int $vendor , int $type , string $value , ?int $options = 0 , int $tag = 0 ) : bool {}
101+
102+
/**
103+
* @param resource $radius_handle
104+
*/
105+
function radius_request_authenticator ( $radius_handle ) : string|false {}
106+
107+
/**
108+
* @param resource $radius_handle
109+
*/
110+
function radius_salt_encrypt_attr ( $radius_handle , string $data ) : string|false {}
111+
112+
/**
113+
* @param resource $radius_handle
114+
*/
115+
function radius_send_request ( $radius_handle ) : int|false {}
116+
117+
/**
118+
* @param resource $radius_handle
119+
*/
120+
function radius_server_secret ( $radius_handle ) : string {}
121+
122+
/**
123+
* @param resource $radius_handle
124+
*/
125+
function radius_strerror ( $radius_handle ) : string {}
126+

0 commit comments

Comments
 (0)