socketmodule.c: fix for platforms w/o IPV6 (i.e.Solaris 5.7)

[matt979]

BPO	845306
Nosy	@loewis
Files	socketmodule.patch: patch for socketmodule.c (r232 cvs tag)

^{Note: these values reflect the state of the issue at the time it was migrated and might not reflect the current state.}

Show more details

GitHub fields:

assignee = None
closed_at = <Date 2004-08-18.12:54:43.000>
created_at = <Date 2003-11-19.18:36:59.000>
labels = ['extension-modules']
title = 'socketmodule.c: fix for platforms w/o IPV6 (i.e.Solaris 5.7)'
updated_at = <Date 2004-08-18.12:54:43.000>
user = 'https://bugs.python.org/matt979'

bugs.python.org fields:

activity = <Date 2004-08-18.12:54:43.000>
actor = 'loewis'
assignee = 'none'
closed = True
closed_date = None
closer = None
components = ['Extension Modules']
creation = <Date 2003-11-19.18:36:59.000>
creator = 'matt979'
dependencies = []
files = ['5694']
hgrepos = []
issue_num = 845306
keywords = ['patch']
message_count = 4.0
messages = ['44906', '44907', '44908', '44909']
nosy_count = 2.0
nosy_names = ['loewis', 'matt979']
pr_nums = []
priority = 'normal'
resolution = 'accepted'
stage = None
status = 'closed'
superseder = None
type = None
url = 'https://bugs.python.org/issue845306'
versions = ['Python 2.3']

[matt979]

Fixes Bug bpo-818490

socketmodule.c will not compile on platforms without
IPV6 support such as Solaris 5.7 because the AF_INET6
and INET_ADDRSTRLEN are used outside the
ENABLE_IPV6 guarded sections.

For example (lines 2971-2977):

#ifndef ENABLE_IPV6
    if(af == AF_INET6) {
        PyErr_SetString(socket_error,
                "can't use AF_INET6, IPv6 is disabled");
        return NULL;
    }
#endif

The code is putting error checking in when IPV6 is not
supported, but it is using the AF_INET6 define which
does not exist on platforms w/o IPV6.

I simply removed the block and let the check fall to the
inet_pton call.

I'm not so clear as what to do w/ INET_ADDRSTRLEN
define because I'm not knowledgable about its history.
At least under Solaris, INET_ADDRSTRLEN along with
INET6_ADDRSTRLEN only appear w/ IPV6 support.

In the patch, I simply substituted it with 16 which is the
value. Since its just the number of characters in a
dotted IP address, it seems like it would be pretty
constant accross platforms.

The diff given is against the r232 cvs tag.

[loewis]

Logged In: YES
user_id=21627

The patch is incorrect: The block checking for AF_INET6
should not be removed. On some systems, AF_INET6 might be
available, and using it with disabled IPv6 should cause an
exception.

Instead, you should check whether AF_INET6 is defined also.

[matt979]

Logged In: YES
user_id=912994

Sounds good. I guarded that code with:

#if ! defined(ENABLE_IPV6) && defined(AF_INET6)

Uploaded attached new patch.

[loewis]

Logged In: YES
user_id=21627

Somethink like this has been committed as socketmodule.c 1.290.