head 1.1; branch 1.1.1; access; symbols pkgsrc-2026Q1:1.1.1.1.0.192 pkgsrc-2026Q1-base:1.1.1.1 pkgsrc-2025Q4:1.1.1.1.0.190 pkgsrc-2025Q4-base:1.1.1.1 pkgsrc-2025Q3:1.1.1.1.0.188 pkgsrc-2025Q3-base:1.1.1.1 pkgsrc-2025Q2:1.1.1.1.0.186 pkgsrc-2025Q2-base:1.1.1.1 pkgsrc-2025Q1:1.1.1.1.0.184 pkgsrc-2025Q1-base:1.1.1.1 pkgsrc-2024Q4:1.1.1.1.0.182 pkgsrc-2024Q4-base:1.1.1.1 pkgsrc-2024Q3:1.1.1.1.0.180 pkgsrc-2024Q3-base:1.1.1.1 pkgsrc-2024Q2:1.1.1.1.0.178 pkgsrc-2024Q2-base:1.1.1.1 pkgsrc-2024Q1:1.1.1.1.0.176 pkgsrc-2024Q1-base:1.1.1.1 pkgsrc-2023Q4:1.1.1.1.0.174 pkgsrc-2023Q4-base:1.1.1.1 pkgsrc-2023Q3:1.1.1.1.0.172 pkgsrc-2023Q3-base:1.1.1.1 pkgsrc-2023Q2:1.1.1.1.0.170 pkgsrc-2023Q2-base:1.1.1.1 pkgsrc-2023Q1:1.1.1.1.0.168 pkgsrc-2023Q1-base:1.1.1.1 pkgsrc-2022Q4:1.1.1.1.0.166 pkgsrc-2022Q4-base:1.1.1.1 pkgsrc-2022Q3:1.1.1.1.0.164 pkgsrc-2022Q3-base:1.1.1.1 pkgsrc-2022Q2:1.1.1.1.0.162 pkgsrc-2022Q2-base:1.1.1.1 pkgsrc-2022Q1:1.1.1.1.0.160 pkgsrc-2022Q1-base:1.1.1.1 pkgsrc-2021Q4:1.1.1.1.0.158 pkgsrc-2021Q4-base:1.1.1.1 pkgsrc-2021Q3:1.1.1.1.0.156 pkgsrc-2021Q3-base:1.1.1.1 pkgsrc-2021Q2:1.1.1.1.0.154 pkgsrc-2021Q2-base:1.1.1.1 pkgsrc-2021Q1:1.1.1.1.0.152 pkgsrc-2021Q1-base:1.1.1.1 pkgsrc-2020Q4:1.1.1.1.0.150 pkgsrc-2020Q4-base:1.1.1.1 pkgsrc-2020Q3:1.1.1.1.0.148 pkgsrc-2020Q3-base:1.1.1.1 pkgsrc-2020Q2:1.1.1.1.0.144 pkgsrc-2020Q2-base:1.1.1.1 pkgsrc-2020Q1:1.1.1.1.0.124 pkgsrc-2020Q1-base:1.1.1.1 pkgsrc-2019Q4:1.1.1.1.0.146 pkgsrc-2019Q4-base:1.1.1.1 pkgsrc-2019Q3:1.1.1.1.0.142 pkgsrc-2019Q3-base:1.1.1.1 pkgsrc-2019Q2:1.1.1.1.0.140 pkgsrc-2019Q2-base:1.1.1.1 pkgsrc-2019Q1:1.1.1.1.0.138 pkgsrc-2019Q1-base:1.1.1.1 pkgsrc-2018Q4:1.1.1.1.0.136 pkgsrc-2018Q4-base:1.1.1.1 pkgsrc-2018Q3:1.1.1.1.0.134 pkgsrc-2018Q3-base:1.1.1.1 pkgsrc-2018Q2:1.1.1.1.0.132 pkgsrc-2018Q2-base:1.1.1.1 pkgsrc-2018Q1:1.1.1.1.0.130 pkgsrc-2018Q1-base:1.1.1.1 pkgsrc-2017Q4:1.1.1.1.0.128 pkgsrc-2017Q4-base:1.1.1.1 pkgsrc-2017Q3:1.1.1.1.0.126 pkgsrc-2017Q3-base:1.1.1.1 pkgsrc-2017Q2:1.1.1.1.0.122 pkgsrc-2017Q2-base:1.1.1.1 pkgsrc-2017Q1:1.1.1.1.0.120 pkgsrc-2017Q1-base:1.1.1.1 pkgsrc-2016Q4:1.1.1.1.0.118 pkgsrc-2016Q4-base:1.1.1.1 pkgsrc-2016Q3:1.1.1.1.0.116 pkgsrc-2016Q3-base:1.1.1.1 pkgsrc-2016Q2:1.1.1.1.0.114 pkgsrc-2016Q2-base:1.1.1.1 pkgsrc-2016Q1:1.1.1.1.0.112 pkgsrc-2016Q1-base:1.1.1.1 pkgsrc-2015Q4:1.1.1.1.0.110 pkgsrc-2015Q4-base:1.1.1.1 pkgsrc-2015Q3:1.1.1.1.0.108 pkgsrc-2015Q3-base:1.1.1.1 pkgsrc-2015Q2:1.1.1.1.0.106 pkgsrc-2015Q2-base:1.1.1.1 pkgsrc-2015Q1:1.1.1.1.0.104 pkgsrc-2015Q1-base:1.1.1.1 pkgsrc-2014Q4:1.1.1.1.0.102 pkgsrc-2014Q4-base:1.1.1.1 pkgsrc-2014Q3:1.1.1.1.0.100 pkgsrc-2014Q3-base:1.1.1.1 pkgsrc-2014Q2:1.1.1.1.0.98 pkgsrc-2014Q2-base:1.1.1.1 pkgsrc-2014Q1:1.1.1.1.0.96 pkgsrc-2014Q1-base:1.1.1.1 pkgsrc-2013Q4:1.1.1.1.0.94 pkgsrc-2013Q4-base:1.1.1.1 pkgsrc-2013Q3:1.1.1.1.0.92 pkgsrc-2013Q3-base:1.1.1.1 pkgsrc-2013Q2:1.1.1.1.0.90 pkgsrc-2013Q2-base:1.1.1.1 pkgsrc-2013Q1:1.1.1.1.0.88 pkgsrc-2013Q1-base:1.1.1.1 pkgsrc-2012Q4:1.1.1.1.0.86 pkgsrc-2012Q4-base:1.1.1.1 pkgsrc-2012Q3:1.1.1.1.0.84 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.82 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.80 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-2011Q4:1.1.1.1.0.78 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.76 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-2011Q2:1.1.1.1.0.74 pkgsrc-2011Q2-base:1.1.1.1 pkgsrc-2011Q1:1.1.1.1.0.72 pkgsrc-2011Q1-base:1.1.1.1 pkgsrc-2010Q4:1.1.1.1.0.70 pkgsrc-2010Q4-base:1.1.1.1 pkgsrc-2010Q3:1.1.1.1.0.68 pkgsrc-2010Q3-base:1.1.1.1 pkgsrc-2010Q2:1.1.1.1.0.58 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.1.1.0.60 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.1.1.0.4 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.1.1.0.62 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.1.1.0.64 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.1.1.0.66 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.1.1.0.6 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.1.1.0.8 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.1.1.0.10 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.1.1.0.12 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.1.1.0.2 pkgsrc-2008Q1:1.1.1.1.0.14 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.1.1.0.16 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.1.1.0.18 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.1.1.0.20 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.1.1.0.22 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.1.1.0.24 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.1.1.0.26 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.1.1.0.28 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.1.1.0.30 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.1.1.0.32 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.1.1.0.34 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.1.1.0.36 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.1.1.0.38 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.1.1.0.40 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.1.1.0.42 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.1.1.0.44 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.1.1.0.46 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.1.1.0.48 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.1.1.0.52 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.1.1.0.54 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.56 pkgviews-base:1.1 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.50 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.1 date 2002.05.31.13.00.04; author seb; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.00.04; author seb; state Exp; branches 1.1.1.1.50.1 1.1.1.1.58.1; next ; 1.1.1.1.50.1 date 2002.05.31.13.00.04; author jlam; state dead; branches; next 1.1.1.1.50.2; 1.1.1.1.50.2 date 2002.06.23.18.48.10; author jlam; state Exp; branches; next ; 1.1.1.1.58.1 date 2010.07.04.07.18.44; author agc; state Exp; branches; next ; desc @@ 1.1 log @Initial revision @ text @$NetBSD$ --- connserv.c.orig Tue Jul 7 00:31:16 1998 +++ connserv.c Tue Nov 7 20:58:57 2000 @@@@ -14,6 +14,10 @@@@ #include #include +#ifdef PF_INET6 +# define HAVE_GETADDRINFO +#endif + #define SKK_PORT_NUMBER 1178 #define SKK_SERVICENAME "skkserv" @@@@ -36,50 +40,112 @@@@ int sock; int i; unsigned short port; +#ifdef HAVE_GETADDRINFO + struct addrinfo aihint, *ai0, *ai; + int error; +#else struct sockaddr_in hostaddr; struct hostent *entry; struct servent *serv; struct protoent *proto; - int a1,a2,a3,a4; +#endif char *hostname; - - serv = getservbyname(SKK_SERVICENAME,"tcp"); - fillzero((char*)&hostaddr,sizeof(struct sockaddr_in)); - if ((proto = getprotobyname("tcp")) == NULL) { - return -1; - } - - if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) { - return -1; +#ifdef SKK_CONF /* use skk.conf */ + FILE *conffp; + char line[128]; + char hostbuf[128]; + char servbuf[128]; + char *confhost = NULL; + char *confport = SKK_SERVICENAME; + + if ((conffp = fopen(SKK_CONF, "r")) != NULL) { + char *p, *data; + + while (fgets(line, sizeof line, conffp) != NULL) { + if ((p = strchr(line, '#')) != NULL) + *p = '\0'; + if ((p = strtok(line, ": \t\n")) == NULL) + continue; + if ((data = strtok((char *) NULL, " \t\n")) == NULL) + continue; + if (!strcmp(p, "skkserv_host")) { + strcpy(hostbuf, data); + confhost = hostbuf; + } else if (!strcmp(p, "skkserv_port")) { + strcpy(servbuf, data); + confport = servbuf; + } + } } +# undef SKK_SERVICENAME +# define SKK_SERVICENAME confport +#endif if (SKKServerHost) hostname = SKKServerHost; else if ((hostname = getenv("SKKSERVER")) == NULL) { +#ifdef SKK_CONF + if ((hostname = confhost) == NULL) +#endif #ifdef SKK_SERVER_HOST hostname = SKK_SERVER_HOST; #else return -1; #endif } - if ('0' <= *hostname && *hostname <= '9') { - if (sscanf(hostname,"%d.%d.%d.%d",&a1,&a2,&a3,&a4) != 4) { - return -1; - } - a1 = (a1<<24)|(a2<<16)|(a3<<8)|a4; - hostaddr.sin_addr.s_addr = htonl(a1); + +#ifdef HAVE_GETADDRINFO + fillzero((char*)&aihint, sizeof aihint); + aihint.ai_family = PF_UNSPEC; + aihint.ai_socktype = SOCK_STREAM; + aihint.ai_flags = AI_CANONNAME; + error = getaddrinfo(hostname, SKK_SERVICENAME, &aihint, &ai0); + if (error) { + printf("%s: %s\r\n", gai_strerror(error), hostname); + return -1; + } + + sock = -1; + for (ai = ai0; ai; ai = ai->ai_next) { + sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (sock >= 0 && + connect(sock, ai->ai_addr, ai->ai_addrlen) == 0) + break; + close(sock); + sock = -1; + } + if (sock < 0) { + perror(hostname); + return -1; + } +#else + serv = getservbyname(SKK_SERVICENAME,"tcp"); + fillzero((char*)&hostaddr,sizeof(struct sockaddr_in)); + if ((proto = getprotobyname("tcp")) == NULL) { + return -1; } - else { + + if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) { + return -1; + } + + if ((hostaddr.sin_addr.s_addr = inet_addr(hostname)) == INADDR_NONE) { if ((entry = gethostbyname(hostname)) == NULL) { return -1; } bincopy(entry->h_addr, &hostaddr.sin_addr, entry->h_length); } hostaddr.sin_family = AF_INET; - hostaddr.sin_port = serv ? serv->s_port : htons(SKK_PORT_NUMBER); + hostaddr.sin_port = + serv ? serv->s_port : +#ifdef SKK_CONF + (i = atoi(confport)) > 0 ? htons(i) : +#endif + htons(SKK_PORT_NUMBER); if (connect(sock,(struct sockaddr *)&hostaddr,sizeof(struct sockaddr_in)) < 0) { return -1; } +#endif printf("SKKSERVER=%s\r\n",hostname); skkservsock = sock; rserv = fdopen(sock,"r"); @ 1.1.1.1 log @Reimport of package skkfep from japanese/skkfep into inputmethod/skkfep. This is part of the japanese category retirement. CATEGORIES adjusted. @ text @@ 1.1.1.1.50.1 log @file patch-bb was added on branch buildlink2 on 2002-06-23 18:48:10 +0000 @ text @d1 146 @ 1.1.1.1.50.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 146 $NetBSD: patch-bb,v 1.1.1.1.50.1 2002/06/23 18:48:10 jlam Exp $ --- connserv.c.orig Tue Jul 7 00:31:16 1998 +++ connserv.c Tue Nov 7 20:58:57 2000 @@@@ -14,6 +14,10 @@@@ #include #include +#ifdef PF_INET6 +# define HAVE_GETADDRINFO +#endif + #define SKK_PORT_NUMBER 1178 #define SKK_SERVICENAME "skkserv" @@@@ -36,50 +40,112 @@@@ int sock; int i; unsigned short port; +#ifdef HAVE_GETADDRINFO + struct addrinfo aihint, *ai0, *ai; + int error; +#else struct sockaddr_in hostaddr; struct hostent *entry; struct servent *serv; struct protoent *proto; - int a1,a2,a3,a4; +#endif char *hostname; - - serv = getservbyname(SKK_SERVICENAME,"tcp"); - fillzero((char*)&hostaddr,sizeof(struct sockaddr_in)); - if ((proto = getprotobyname("tcp")) == NULL) { - return -1; - } - - if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) { - return -1; +#ifdef SKK_CONF /* use skk.conf */ + FILE *conffp; + char line[128]; + char hostbuf[128]; + char servbuf[128]; + char *confhost = NULL; + char *confport = SKK_SERVICENAME; + + if ((conffp = fopen(SKK_CONF, "r")) != NULL) { + char *p, *data; + + while (fgets(line, sizeof line, conffp) != NULL) { + if ((p = strchr(line, '#')) != NULL) + *p = '\0'; + if ((p = strtok(line, ": \t\n")) == NULL) + continue; + if ((data = strtok((char *) NULL, " \t\n")) == NULL) + continue; + if (!strcmp(p, "skkserv_host")) { + strcpy(hostbuf, data); + confhost = hostbuf; + } else if (!strcmp(p, "skkserv_port")) { + strcpy(servbuf, data); + confport = servbuf; + } + } } +# undef SKK_SERVICENAME +# define SKK_SERVICENAME confport +#endif if (SKKServerHost) hostname = SKKServerHost; else if ((hostname = getenv("SKKSERVER")) == NULL) { +#ifdef SKK_CONF + if ((hostname = confhost) == NULL) +#endif #ifdef SKK_SERVER_HOST hostname = SKK_SERVER_HOST; #else return -1; #endif } - if ('0' <= *hostname && *hostname <= '9') { - if (sscanf(hostname,"%d.%d.%d.%d",&a1,&a2,&a3,&a4) != 4) { - return -1; - } - a1 = (a1<<24)|(a2<<16)|(a3<<8)|a4; - hostaddr.sin_addr.s_addr = htonl(a1); + +#ifdef HAVE_GETADDRINFO + fillzero((char*)&aihint, sizeof aihint); + aihint.ai_family = PF_UNSPEC; + aihint.ai_socktype = SOCK_STREAM; + aihint.ai_flags = AI_CANONNAME; + error = getaddrinfo(hostname, SKK_SERVICENAME, &aihint, &ai0); + if (error) { + printf("%s: %s\r\n", gai_strerror(error), hostname); + return -1; + } + + sock = -1; + for (ai = ai0; ai; ai = ai->ai_next) { + sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (sock >= 0 && + connect(sock, ai->ai_addr, ai->ai_addrlen) == 0) + break; + close(sock); + sock = -1; + } + if (sock < 0) { + perror(hostname); + return -1; + } +#else + serv = getservbyname(SKK_SERVICENAME,"tcp"); + fillzero((char*)&hostaddr,sizeof(struct sockaddr_in)); + if ((proto = getprotobyname("tcp")) == NULL) { + return -1; } - else { + + if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) { + return -1; + } + + if ((hostaddr.sin_addr.s_addr = inet_addr(hostname)) == INADDR_NONE) { if ((entry = gethostbyname(hostname)) == NULL) { return -1; } bincopy(entry->h_addr, &hostaddr.sin_addr, entry->h_length); } hostaddr.sin_family = AF_INET; - hostaddr.sin_port = serv ? serv->s_port : htons(SKK_PORT_NUMBER); + hostaddr.sin_port = + serv ? serv->s_port : +#ifdef SKK_CONF + (i = atoi(confport)) > 0 ? htons(i) : +#endif + htons(SKK_PORT_NUMBER); if (connect(sock,(struct sockaddr *)&hostaddr,sizeof(struct sockaddr_in)) < 0) { return -1; } +#endif printf("SKKSERVER=%s\r\n",hostname); skkservsock = sock; rserv = fdopen(sock,"r"); @ 1.1.1.1.58.1 log @Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching error, and to sync with reality. @ text @d1 1 a1 1 $NetBSD: patch-bb,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $ @