head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2:1.2.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2002.05.31.15.36.41; author seb; state dead; branches; next 1.2; 1.2 date 2000.11.09.03.53.31; author itohy; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 99.12.24.03.21.10; author itohy; state Exp; branches 1.1.1.1; next ; 1.2.2.1 date 2002.06.23.18.49.42; author jlam; state dead; branches; next ; 1.1.1.1 date 99.12.24.03.21.10; author itohy; state Exp; branches; next ; desc @@ 1.3 log @Remove all package and category files from the japanese category. This effectively retire the japanese category. @ text @$NetBSD: patch-bb,v 1.2 2000/11/09 03:53:31 itohy 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.2 log @Dual stack (IPv6) support. Make "skkserv_port:" line in skk.conf accept the service name as well as the port number. @ text @d1 1 a1 1 $NetBSD: patch-bb,v 1.1.1.1 1999/12/24 03:21:10 itohy Exp $ @ 1.2.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-bb,v 1.2 2000/11/09 03:53:31 itohy Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d4 21 a24 2 +++ connserv.c Fri Dec 24 00:25:24 1999 @@@@ -40,8 +40,33 @@@@ d29 1 d31 9 d44 1 d46 1 a46 1 + int confport = 0; d62 2 a63 1 + confport = atoi(data); d66 3 a68 1 + } a70 3 serv = getservbyname(SKK_SERVICENAME,"tcp"); fillzero((char*)&hostaddr,sizeof(struct sockaddr_in)); @@@@ -56,27 +81,27 @@@@ d89 31 a119 1 - } d121 5 d135 1 d137 1 a137 1 + confport ? htons(confport) : d139 1 a139 1 + serv ? serv->s_port : htons(SKK_PORT_NUMBER); d143 4 @ 1.1.1.1 log @Terminal based SKK-like Kana-to-Kanji FrontEnd Processor written in C. @ text @@