From: markt Date: Tue, 24 Oct 2006 03:10:47 +0000 (+0000) Subject: Correct props. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b751f0e27a7ef96e5b81bf09673b795e898ff3dd;p=tomcat7.0 Correct props. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@467212 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/native/connector/src/address.c b/native/connector/src/address.c index 36890c4d7..b2291fa5a 100644 --- a/native/connector/src/address.c +++ b/native/connector/src/address.c @@ -1,106 +1,106 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (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.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * - * @author Mladen Turk - * @version $Revision: 416783 $, $Date: 2006-06-23 20:06:15 +0200 (pet, 23 lip 2006) $ - */ - -#include "tcn.h" - -TCN_IMPLEMENT_CALL(jlong, Address, info)(TCN_STDARGS, - jstring hostname, - jint family, jint port, - jint flags, jlong pool) -{ - apr_pool_t *p = J2P(pool, apr_pool_t *); - TCN_ALLOC_CSTRING(hostname); - apr_sockaddr_t *sa = NULL; - apr_int32_t f; - - - UNREFERENCED(o); - GET_S_FAMILY(f, family); - TCN_THROW_IF_ERR(apr_sockaddr_info_get(&sa, - J2S(hostname), f, (apr_port_t)port, - (apr_int32_t)flags, p), sa); - -cleanup: - TCN_FREE_CSTRING(hostname); - return P2J(sa); -} - -TCN_IMPLEMENT_CALL(jstring, Address, getnameinfo)(TCN_STDARGS, - jlong sa, jint flags) -{ - apr_sockaddr_t *s = J2P(sa, apr_sockaddr_t *); - char *hostname; - - UNREFERENCED(o); - if (apr_getnameinfo(&hostname, s, (apr_int32_t)flags) == APR_SUCCESS) - return AJP_TO_JSTRING(hostname); - else - return NULL; -} - -TCN_IMPLEMENT_CALL(jstring, Address, getip)(TCN_STDARGS, jlong sa) -{ - apr_sockaddr_t *s = J2P(sa, apr_sockaddr_t *); - char *ipaddr; - - UNREFERENCED(o); - if (apr_sockaddr_ip_get(&ipaddr, s) == APR_SUCCESS) - return AJP_TO_JSTRING(ipaddr); - else - return NULL; -} - -TCN_IMPLEMENT_CALL(jlong, Address, get)(TCN_STDARGS, jint which, - jlong sock) -{ - tcn_socket_t *s = J2P(sock, tcn_socket_t *); - apr_sockaddr_t *sa = NULL; - - UNREFERENCED(o); - TCN_THROW_IF_ERR(apr_socket_addr_get(&sa, - (apr_interface_e)which, s->sock), sa); -cleanup: - return P2J(sa); -} - -TCN_IMPLEMENT_CALL(jint, Address, equal)(TCN_STDARGS, - jlong a, jlong b) -{ - apr_sockaddr_t *sa = J2P(a, apr_sockaddr_t *); - apr_sockaddr_t *sb = J2P(b, apr_sockaddr_t *); - - UNREFERENCED_STDARGS; - return apr_sockaddr_equal(sa, sb) ? JNI_TRUE : JNI_FALSE; -} - -TCN_IMPLEMENT_CALL(jint, Address, getservbyname)(TCN_STDARGS, - jlong sa, jstring servname) -{ - apr_sockaddr_t *s = J2P(sa, apr_sockaddr_t *); - TCN_ALLOC_CSTRING(servname); - apr_status_t rv; - - UNREFERENCED(o); - rv = apr_getservbyname(s, J2S(servname)); - TCN_FREE_CSTRING(servname); - return (jint)rv; -} +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * + * @author Mladen Turk + * @version $Revision$, $Date$ + */ + +#include "tcn.h" + +TCN_IMPLEMENT_CALL(jlong, Address, info)(TCN_STDARGS, + jstring hostname, + jint family, jint port, + jint flags, jlong pool) +{ + apr_pool_t *p = J2P(pool, apr_pool_t *); + TCN_ALLOC_CSTRING(hostname); + apr_sockaddr_t *sa = NULL; + apr_int32_t f; + + + UNREFERENCED(o); + GET_S_FAMILY(f, family); + TCN_THROW_IF_ERR(apr_sockaddr_info_get(&sa, + J2S(hostname), f, (apr_port_t)port, + (apr_int32_t)flags, p), sa); + +cleanup: + TCN_FREE_CSTRING(hostname); + return P2J(sa); +} + +TCN_IMPLEMENT_CALL(jstring, Address, getnameinfo)(TCN_STDARGS, + jlong sa, jint flags) +{ + apr_sockaddr_t *s = J2P(sa, apr_sockaddr_t *); + char *hostname; + + UNREFERENCED(o); + if (apr_getnameinfo(&hostname, s, (apr_int32_t)flags) == APR_SUCCESS) + return AJP_TO_JSTRING(hostname); + else + return NULL; +} + +TCN_IMPLEMENT_CALL(jstring, Address, getip)(TCN_STDARGS, jlong sa) +{ + apr_sockaddr_t *s = J2P(sa, apr_sockaddr_t *); + char *ipaddr; + + UNREFERENCED(o); + if (apr_sockaddr_ip_get(&ipaddr, s) == APR_SUCCESS) + return AJP_TO_JSTRING(ipaddr); + else + return NULL; +} + +TCN_IMPLEMENT_CALL(jlong, Address, get)(TCN_STDARGS, jint which, + jlong sock) +{ + tcn_socket_t *s = J2P(sock, tcn_socket_t *); + apr_sockaddr_t *sa = NULL; + + UNREFERENCED(o); + TCN_THROW_IF_ERR(apr_socket_addr_get(&sa, + (apr_interface_e)which, s->sock), sa); +cleanup: + return P2J(sa); +} + +TCN_IMPLEMENT_CALL(jint, Address, equal)(TCN_STDARGS, + jlong a, jlong b) +{ + apr_sockaddr_t *sa = J2P(a, apr_sockaddr_t *); + apr_sockaddr_t *sb = J2P(b, apr_sockaddr_t *); + + UNREFERENCED_STDARGS; + return apr_sockaddr_equal(sa, sb) ? JNI_TRUE : JNI_FALSE; +} + +TCN_IMPLEMENT_CALL(jint, Address, getservbyname)(TCN_STDARGS, + jlong sa, jstring servname) +{ + apr_sockaddr_t *s = J2P(sa, apr_sockaddr_t *); + TCN_ALLOC_CSTRING(servname); + apr_status_t rv; + + UNREFERENCED(o); + rv = apr_getservbyname(s, J2S(servname)); + TCN_FREE_CSTRING(servname); + return (jint)rv; +} diff --git a/native/connector/src/multicast.c b/native/connector/src/multicast.c index 5cf5d7890..7691578f3 100644 --- a/native/connector/src/multicast.c +++ b/native/connector/src/multicast.c @@ -1,72 +1,72 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (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.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * - * @author Mladen Turk - * @version $Revision: 416783 $, $Date: 2006-06-23 20:06:15 +0200 (pet, 23 lip 2006) $ - */ - -#include "tcn.h" - -TCN_IMPLEMENT_CALL(jint, Mulicast, join)(TCN_STDARGS, - jlong sock, jlong join, - jlong iface, jlong source) -{ - tcn_socket_t *s = J2P(sock, tcn_socket_t *); - apr_sockaddr_t *ja = J2P(join, apr_sockaddr_t *); - apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *); - apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *); - UNREFERENCED_STDARGS; - return (jint)apr_mcast_join(s->sock, ja, ia, sa); -}; - -TCN_IMPLEMENT_CALL(jint, Mulicast, leave)(TCN_STDARGS, - jlong sock, jlong addr, - jlong iface, jlong source) -{ - tcn_socket_t *s = J2P(sock, tcn_socket_t *); - apr_sockaddr_t *aa = J2P(addr, apr_sockaddr_t *); - apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *); - apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *); - UNREFERENCED_STDARGS; - return (jint)apr_mcast_leave(s->sock, aa, ia, sa); -}; - -TCN_IMPLEMENT_CALL(jint, Mulicast, hops)(TCN_STDARGS, - jlong sock, jint ttl) -{ - tcn_socket_t *s = J2P(sock, tcn_socket_t *); - UNREFERENCED_STDARGS; - return (jint)apr_mcast_hops(s->sock, (apr_byte_t)ttl); -}; - -TCN_IMPLEMENT_CALL(jint, Mulicast, loopback)(TCN_STDARGS, - jlong sock, jboolean opt) -{ - tcn_socket_t *s = J2P(sock, tcn_socket_t *); - UNREFERENCED_STDARGS; - return (jint)apr_mcast_loopback(s->sock, opt == JNI_TRUE ? 1 : 0); -}; - -TCN_IMPLEMENT_CALL(jint, Mulicast, ointerface)(TCN_STDARGS, - jlong sock, jlong iface) -{ - tcn_socket_t *s = J2P(sock, tcn_socket_t *); - apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *); - UNREFERENCED_STDARGS; - return (jint)apr_mcast_interface(s->sock, ia); -}; +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * + * @author Mladen Turk + * @version $Revision$, $Date$ + */ + +#include "tcn.h" + +TCN_IMPLEMENT_CALL(jint, Mulicast, join)(TCN_STDARGS, + jlong sock, jlong join, + jlong iface, jlong source) +{ + tcn_socket_t *s = J2P(sock, tcn_socket_t *); + apr_sockaddr_t *ja = J2P(join, apr_sockaddr_t *); + apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *); + apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *); + UNREFERENCED_STDARGS; + return (jint)apr_mcast_join(s->sock, ja, ia, sa); +}; + +TCN_IMPLEMENT_CALL(jint, Mulicast, leave)(TCN_STDARGS, + jlong sock, jlong addr, + jlong iface, jlong source) +{ + tcn_socket_t *s = J2P(sock, tcn_socket_t *); + apr_sockaddr_t *aa = J2P(addr, apr_sockaddr_t *); + apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *); + apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *); + UNREFERENCED_STDARGS; + return (jint)apr_mcast_leave(s->sock, aa, ia, sa); +}; + +TCN_IMPLEMENT_CALL(jint, Mulicast, hops)(TCN_STDARGS, + jlong sock, jint ttl) +{ + tcn_socket_t *s = J2P(sock, tcn_socket_t *); + UNREFERENCED_STDARGS; + return (jint)apr_mcast_hops(s->sock, (apr_byte_t)ttl); +}; + +TCN_IMPLEMENT_CALL(jint, Mulicast, loopback)(TCN_STDARGS, + jlong sock, jboolean opt) +{ + tcn_socket_t *s = J2P(sock, tcn_socket_t *); + UNREFERENCED_STDARGS; + return (jint)apr_mcast_loopback(s->sock, opt == JNI_TRUE ? 1 : 0); +}; + +TCN_IMPLEMENT_CALL(jint, Mulicast, ointerface)(TCN_STDARGS, + jlong sock, jlong iface) +{ + tcn_socket_t *s = J2P(sock, tcn_socket_t *); + apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *); + UNREFERENCED_STDARGS; + return (jint)apr_mcast_interface(s->sock, ia); +}; diff --git a/native/connector/src/thread.c b/native/connector/src/thread.c index e6193193a..e074ff4a7 100644 --- a/native/connector/src/thread.c +++ b/native/connector/src/thread.c @@ -1,29 +1,29 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (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.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * - * @author Mladen Turk - * @version $Revision: 393735 $, $Date: 2006-04-13 08:41:49 +0200 (čet, 13 tra 2006) $ - */ - -#include "tcn.h" - -TCN_IMPLEMENT_CALL(jlong, Thread, current)(TCN_STDARGS) -{ - UNREFERENCED_STDARGS; - return (jlong)((unsigned long)apr_os_thread_current()); -} +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * + * @author Mladen Turk + * @version $Revision$, $Date$ + */ + +#include "tcn.h" + +TCN_IMPLEMENT_CALL(jlong, Thread, current)(TCN_STDARGS) +{ + UNREFERENCED_STDARGS; + return (jlong)((unsigned long)apr_os_thread_current()); +} diff --git a/native/connector/srclib/VERSIONS b/native/connector/srclib/VERSIONS index d3b475e97..e08983873 100644 --- a/native/connector/srclib/VERSIONS +++ b/native/connector/srclib/VERSIONS @@ -1,4 +1,4 @@ -Use the following version of the libraries - -- APR 1.2.7, http://apr.apache.org -- OpenSSL 0.9.8d, http://www.openssl.org +Use the following version of the libraries + +- APR 1.2.7, http://apr.apache.org +- OpenSSL 0.9.8d, http://www.openssl.org