View | Details | Raw Unified | Return to bug 43327
Collapse All | Expand All

(-)connector/include/tcn.h (+6 lines)
Lines 278-283 Link Here
278
    else if (F == 2) T = APR_INET6;  \
278
    else if (F == 2) T = APR_INET6;  \
279
    else T = F
279
    else T = F
280
280
281
#define TCN_GET_S_FAMILY(F, T)       \
282
    if (T == APR_UNSPEC) F = 0;      \
283
    else if (T == APR_INET) F = 1;   \
284
    else if (T == APR_INET6) F = 2;  \
285
    else F = T
286
281
#define GET_S_TYPE(T, F)             \
287
#define GET_S_TYPE(T, F)             \
282
    if (F == 0) T = SOCK_STREAM;     \
288
    if (F == 0) T = SOCK_STREAM;     \
283
    else if (F == 1) T = SOCK_DGRAM; \
289
    else if (F == 1) T = SOCK_DGRAM; \
(-)connector/src/info.c (-1 / +4 lines)
Lines 201-211 Link Here
201
static void fill_ainfo(JNIEnv *e, jobject obj, apr_sockaddr_t *info)
201
static void fill_ainfo(JNIEnv *e, jobject obj, apr_sockaddr_t *info)
202
{
202
{
203
203
204
    apr_int32_t f;
205
    TCN_GET_S_FAMILY(f, info->family);
206
204
    SET_AINFO_J(pool, P2J(info->pool));
207
    SET_AINFO_J(pool, P2J(info->pool));
205
    SET_AINFO_S(hostname, info->hostname);
208
    SET_AINFO_S(hostname, info->hostname);
206
    SET_AINFO_S(servname, info->servname);
209
    SET_AINFO_S(servname, info->servname);
207
    SET_AINFO_I(port, info->port);
210
    SET_AINFO_I(port, info->port);
208
    SET_AINFO_I(family, info->family);
211
    SET_AINFO_I(family, f);
209
    SET_AINFO_J(next, P2J(info->next));
212
    SET_AINFO_J(next, P2J(info->next));
210
213
211
}
214
}

Return to bug 43327