relayd socket splicing timeout
Hi,
During socket splicing the relayd session timeouts could not be
measured exactly in user land. Use the new idle timeout for socket
splicing in the kernel to make it correct.
ok?
bluhm
Index: usr.sbin/relayd//parse.y
===
RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/relayd/parse.y,v
retrieving revision 1.158
diff -u -p -r1.158 parse.y
--- usr.sbin/relayd//parse.y26 May 2011 14:48:20 - 1.158
+++ usr.sbin/relayd//parse.y3 Sep 2011 00:11:25 -
@@ -833,13 +833,6 @@ proto : relay_proto PROTO STRING {
p->type = $1;
p->cache = RELAY_CACHESIZE;
p->tcpflags = TCPFLAG_DEFAULT;
- if (p->type != RELAY_PROTO_TCP) {
- /*
-* Splicing is currently only supported
-* for plain TCP relays.
-*/
- p->tcpflags |= TCPFLAG_NSPLICE;
- }
p->sslflags = SSLFLAG_DEFAULT;
p->tcpbacklog = RELAY_BACKLOG;
(void)strlcpy(p->sslciphers, SSLCIPHERS_DEFAULT,
Index: usr.sbin/relayd//relay.c
===
RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/relayd/relay.c,v
retrieving revision 1.138
diff -u -p -r1.138 relay.c
--- usr.sbin/relayd//relay.c20 May 2011 09:43:53 - 1.138
+++ usr.sbin/relayd//relay.c2 Sep 2011 23:53:48 -
@@ -77,10 +77,12 @@ u_int32_trelay_hash_addr(struct sockad
voidrelay_write(struct bufferevent *, void *);
voidrelay_read(struct bufferevent *, void *);
-int relay_splicelen(struct ctl_relay_event *);
voidrelay_error(struct bufferevent *, short, void *);
voidrelay_dump(struct ctl_relay_event *, const void *, size_t);
+int relay_splice(struct ctl_relay_event *);
+int relay_splicelen(struct ctl_relay_event *);
+
int relay_resolve(struct ctl_relay_event *,
struct protonode *, struct protonode *);
int relay_handle_http(struct ctl_relay_event *,
@@ -675,26 +677,10 @@ relay_connected(int fd, short sig, void
}
break;
case RELAY_PROTO_TCP:
- if ((proto->tcpflags & TCPFLAG_NSPLICE) ||
- (rlay->rl_conf.flags & (F_SSL|F_SSLCLIENT)))
- break;
- if (setsockopt(con->se_in.s, SOL_SOCKET, SO_SPLICE,
- &con->se_out.s, sizeof(int)) == -1) {
- log_debug("%s: session %d: splice forward failed: %s",
- __func__, con->se_id, strerror(errno));
- return;
- }
- con->se_in.splicelen = 0;
- if (setsockopt(con->se_out.s, SOL_SOCKET, SO_SPLICE,
- &con->se_in.s, sizeof(int)) == -1) {
- log_debug("%s: session %d: splice backward failed: %s",
- __func__, con->se_id, strerror(errno));
- return;
- }
- con->se_out.splicelen = 0;
+ /* Use defaults */
break;
default:
- fatalx("relay_input: unknown protocol");
+ fatalx("relay_connected: unknown protocol");
}
/*
@@ -719,6 +705,9 @@ relay_connected(int fd, short sig, void
bufferevent_settimeout(bev,
rlay->rl_conf.timeout.tv_sec, rlay->rl_conf.timeout.tv_sec);
bufferevent_enable(bev, EV_READ|EV_WRITE);
+
+ if (relay_splice(&con->se_out) == -1)
+ relay_close(con, strerror(errno));
}
void
@@ -766,6 +755,9 @@ relay_input(struct rsession *con)
bufferevent_settimeout(con->se_in.bev,
rlay->rl_conf.timeout.tv_sec, rlay->rl_conf.timeout.tv_sec);
bufferevent_enable(con->se_in.bev, EV_READ|EV_WRITE);
+
+ if (relay_splice(&con->se_in) == -1)
+ relay_close(con, strerror(errno));
}
void
@@ -1842,16 +1834,46 @@ relay_close_http(struct rsession *con, u
}
int
+relay_splice(struct ctl_relay_event *cre)
+{
+ struct rsession *con = cre->con;
+ struct relay*rlay = (struct relay *)con->se_relay;
+ struct protocol *proto = rlay->rl_proto;
+ struct splicesp;
+
+ if ((rlay->rl_conf.flags & (F_SSL|F_SSLCLIENT)) ||
+ (proto->tcpflags & TCPFLAG_NSPLICE))
+ return (0);
+
+ if (cre->bev->readcb != relay_read)
+ return (0);
+
+ bzero(&sp, sizeof(sp));
+ sp.sp_fd = cre->dst->s;
+ sp.sp_idle = rlay->rl_conf.timeout;
+ if (setsockopt(cre->s, SOL_SOCKET, SO_SPLICE, &sp, sizeof(sp)) == -1) {
+ log_debug
Re: problem in manual page for ip(4)
Our sys/socket.h and netinet/in.h headers do require sys/types.h, so
it seems consistent to at least document that. ok matthew@
(POSIX requires headers to be self-sufficient, but we're a ways off from
that.)
On Thu, Sep 1, 2011 at 11:42 PM, Jason McIntyre wrote:
> can a developer weigh in on this, please?
> jmc
>
> On Thu, Aug 25, 2011 at 02:44:21PM +0200, Thomas de Grivel wrote:
>> Hi,
>>
>> From ip(4) :
>>
>> SYNOPSIS
>> #include
>> #include
>>
>> However this fails :
>>
>> $ cat > ip.c
>> #include
>> #include
>>
>> int main() {
>> return 0;
>> }
>> ^D
>> $ gcc ip.c
>> In file included from ip.c:1:
>> /usr//include/sys/socket.h:105: error: expected specifier-qualifier-list
>> before 'off_t'
>> /usr//include/sys/socket.h:162: error: expected specifier-qualifier-list
>> before 'u_int8_t'
>> /usr//include/sys/socket.h:180: error: expected specifier-qualifier-list
>> before 'u_int8_t'
>> /usr//include/sys/socket.h:249: error: expected specifier-qualifier-list
>> before 'uid_t'
>> /usr//include/sys/socket.h:394: error: expected specifier-qualifier-list
>> before 'socklen_t'
>> /usr//include/sys/socket.h:420: error: expected specifier-qualifier-list
>> before 'socklen_t'
>> /usr//include/sys/socket.h:476: error: expected specifier-qualifier-list
>> before 'caddr_t'
>> In file included from ip.c:1:
>> /usr//include/sys/socket.h:491: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/sys/socket.h:492: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/sys/socket.h:493: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/sys/socket.h:494: error: expected declaration specifiers
>> or '...' before 'uid_t'
>> /usr//include/sys/socket.h:494: error: expected declaration specifiers
>> or '...' before 'gid_t'
>> /usr//include/sys/socket.h:495: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/sys/socket.h:496: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/sys/socket.h:497: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/sys/socket.h:499: error: expected '=', ',', ';', 'asm' or
>> '__attribute__' before 'recv'
>> /usr//include/sys/socket.h:500: error: expected '=', ',', ';', 'asm' or
>> '__attribute__' before 'recvfrom'
>> /usr//include/sys/socket.h:501: error: expected '=', ',', ';', 'asm' or
>> '__attribute__' before 'recvmsg'
>> /usr//include/sys/socket.h:502: error: expected '=', ',', ';', 'asm' or
>> '__attribute__' before 'send'
>> /usr//include/sys/socket.h:503: error: expected '=', ',', ';', 'asm' or
>> '__attribute__' before 'sendto'
>> /usr//include/sys/socket.h:505: error: expected '=', ',', ';', 'asm' or
>> '__attribute__' before 'sendmsg'
>> /usr//include/sys/socket.h:506: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> In file included from ip.c:2:
>> /usr//include/netinet/in.h:141: error: expected specifier-qualifier-list
>> before 'in_addr_t'
>> /usr//include/netinet/in.h:225: error: expected specifier-qualifier-list
>> before 'u_int8_t'
>> /usr//include/netinet/in.h:244: error: expected specifier-qualifier-list
>> before 'int8_t'
>> In file included from /usr//include/netinet/in.h:732,
>> from ip.c:2:
>> /usr//include/netinet6/in6.h:118: error: expected
>> specifier-qualifier-list before 'u_int8_t'
>> /usr//include/netinet6/in6.h:140: error: expected
>> specifier-qualifier-list before 'u_int8_t'
>> /usr//include/netinet6/in6.h:392: error: expected
>> specifier-qualifier-list before 'u_long'
>> /usr//include/netinet6/in6.h:515: error: expected
>> specifier-qualifier-list before 'u_int32_t'
>> /usr//include/netinet6/in6.h:799: error: expected ';', ',' or ')' before
>> '*' token
>> /usr//include/netinet6/in6.h:801: error: expected '=', ',', ';', 'asm'
>> or '__attribute__' before '*' token
>> /usr//include/netinet6/in6.h:802: error: expected declaration specifiers
>> or '...' before 'u_int8_t'
>> /usr//include/netinet6/in6.h:803: error: expected declaration specifiers
>> or '...' before 'u_int8_t'
>> /usr//include/netinet6/in6.h:805: error: expected '=', ',', ';', 'asm'
>> or '__attribute__' before 'inet6_rthdr_space'
>> /usr//include/netinet6/in6.h:817: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/netinet6/in6.h:818: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/netinet6/in6.h:818: error: expected declaration specifiers
>> or '...' before 'u_int8_t'
>> /usr//include/netinet6/in6.h:819: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/netinet6/in6.h:819: error: expected declaration specifiers
>> or '...' before 'u_int8_t'
>> /usr//include/netinet6/in6.h:820: error: expected declaration specifiers
>> or '...' before 'socklen_t'
>> /usr//include/netinet6/in6.h:821: error: expected declaration specifiers
>> or
Re: ctags(1) and mg
On 2 September 2011 14:17, Matthew Dempsky wrote: > On Fri, Sep 2, 2011 at 8:55 AM, Sunil Nimmagadda > wrote: >> This diff adds tags support to Mg. I am NOT an emacs user so if this >> combination is a bit odd then please excuse. It parses the tags file >> generated by ctags(1) and maintains a tree. M-. on first character of >> a word jumps to it's definition and M-* jumps back to previous location. > > I'd love to have ctags support in mg. > cscope would be cool too, if not too much bloat.
Re: ctags(1) and mg
On Fri, Sep 2, 2011 at 8:55 AM, Sunil Nimmagadda
wrote:
> This diff adds tags support to Mg. I am NOT an emacs user so if this
> combination is a bit odd then please excuse. It parses the tags file
> generated by ctags(1) and maintains a tree. M-. on first character of
> a word jumps to it's definition and M-* jumps back to previous location.
I'd love to have ctags support in mg.
> -# $OpenBSD: Makefile,v 1.24 2011/02/02 05:21:36 lum Exp $
> +# $OpenBSD: Makefile,v 1.23 2011/01/18 17:35:42 lum Exp $
Can you recreate the diff without these changes?
> +/*
> + * Helper function to append a character to a C string.
> + */
> +static void
> +append(char *s, int c)
> +{
> +size_t l = strlen(s);
> + s[l++] = c;
> + s[l] = '\0';
> +}
I don't like this. I don't see any evidence that the length of s here
will be bounded, and it appears to be used to fill a local fixed-sized
buffer.
Having to call strlen() for each character append is suboptimal too.
Means building up the string takes O(n^2) time.
(I haven't had a chance to look at the diff in depth yet, but this
issue stood out to me.)
ctags(1) and mg
Hello,
This diff adds tags support to Mg. I am NOT an emacs user so if this
combination is a bit odd then please excuse. It parses the tags file
generated by ctags(1) and maintains a tree. M-. on first character of
a word jumps to it's definition and M-* jumps back to previous location.
Index: Makefile
===
RCS file: /cvs/src/usr.bin/mg/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile2 Feb 2011 05:21:36 - 1.24
+++ Makefile2 Sep 2011 15:00:39 -
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2011/02/02 05:21:36 lum Exp $
+# $OpenBSD: Makefile,v 1.23 2011/01/18 17:35:42 lum Exp $
PROG= mg
@@ -24,7 +24,7 @@ SRCS= autoexec.c basic.c buffer.c cinfo.
#
# More or less standalone extensions.
#
-SRCS+= cmode.c dired.c grep.c theo.c
+SRCS+= cmode.c dired.c grep.c theo.c tags.c
afterinstall:
${INSTALL} -d ${DESTDIR}${DOCDIR}/mg
Index: buffer.c
===
RCS file: /cvs/src/usr.bin/mg/buffer.c,v
retrieving revision 1.77
diff -u -p -r1.77 buffer.c
--- buffer.c23 Jan 2011 00:45:03 - 1.77
+++ buffer.c2 Sep 2011 15:00:39 -
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.77 2011/01/23 00:45:03 kjell Exp $ */
+/* $OpenBSD: buffer.c,v 1.76 2011/01/21 19:10:13 kjell Exp $ */
/* This file is in the public domain. */
Index: def.h
===
RCS file: /cvs/src/usr.bin/mg/def.h,v
retrieving revision 1.116
diff -u -p -r1.116 def.h
--- def.h 23 Jan 2011 00:45:03 - 1.116
+++ def.h 2 Sep 2011 15:00:39 -
@@ -1,4 +1,4 @@
-/* $OpenBSD: def.h,v 1.116 2011/01/23 00:45:03 kjell Exp $ */
+/* $OpenBSD: def.h,v 1.115 2011/01/18 16:25:40 kjell Exp $ */
/* This file is in the public domain. */
@@ -514,6 +514,10 @@ int backdel(int, int);
int space_to_tabstop(int, int);
int backtoindent(int, int);
int joinline(int, int);
+
+/* tags.c X */
+int pushtag(int, int);
+int poptag(int, int);
/* extend.c X */
int insert(int, int);
Index: keymap.c
===
RCS file: /cvs/src/usr.bin/mg/keymap.c,v
retrieving revision 1.45
diff -u -p -r1.45 keymap.c
--- keymap.c18 Jan 2011 16:25:40 - 1.45
+++ keymap.c2 Sep 2011 15:00:40 -
@@ -1,4 +1,4 @@
-/* $OpenBSD: keymap.c,v 1.45 2011/01/18 16:25:40 kjell Exp $ */
+/* $OpenBSD: keymap.c,v 1.44 2011/01/17 03:12:06 kjell Exp $ */
/* This file is in the public domain. */
@@ -204,8 +204,11 @@ static PF metapct[] = {
};
static PF metami[] = {
+ poptag, /* * */
+ rescan, /* + */
+ rescan, /* , */
negative_argument, /* - */
- rescan, /* . */
+ pushtag,/* . */
rescan, /* / */
digit_argument, /* 0 */
digit_argument, /* 1 */
@@ -231,7 +234,7 @@ static PF metasqf[] = {
joinline, /* ^ */
rescan, /* _ */
rescan, /* ` */
- rescan, /* a */
+ rescan, /* a */
backword, /* b */
capword,/* c */
delfword, /* d */
@@ -298,7 +301,7 @@ struct KEYMAPE (8 + IMAPEXT) metamap = {
'%', '%', metapct, NULL
},
{
- '-', '>', metami, NULL
+ '*', '>', metami, NULL
},
{
'[', 'f', metasqf, (KEYMAP *) &metasqlmap
Index: main.c
===
RCS file: /cvs/src/usr.bin/mg/main.c,v
retrieving revision 1.61
diff -u -p -r1.61 main.c
--- main.c 4 Jun 2009 02:23:37 - 1.61
+++ main.c 2 Sep 2011 15:00:40 -
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.61 2009/06/04 02:23:37 kjell Exp $ */
+/* $OpenBSD: main.c,v 1.60 2008/06/13 18:51:02 kjell Exp $ */
/* This file is in the public domain. */
@@ -77,11 +77,13 @@ main(int argc, char **argv)
extern void theo_init(void);
extern void cmode_init(void);
extern void dired_init(void);
-
+ extern void tags_init(void);
+
dired_init();
grep_init();
theo_init();
cmode_init();
+ tags_init();
}
if (init_fcn_name &&
@@ -217,6 +219,7 @@ edinit(PF init_fcn)
wp->w_rflag = WFMODE | WFFULL; /* Full. */
}
+extern void tags_close(void);
/*
* Quit command. If an argument, always quit. Otherwise confirm if a buffer
* ha
Reactivacion de su cuenta Banco Frances
[IMAGE] ESTIMADO CLIENTE DE BANCO FRANCIS Estimado cliente de Banco Francis, hemos detectado una actividad insual en su cuenta bancaria. Le pedimos que reactive su cuenta , siguiendo el link que le enviamos a continuacisn Esto puede ser debido a: 1) La introduccisn de datos erroneos en el sistema de registro inicial. 2) Un reciente cambio en sus datos personales. Por favor haga click en el enlace abajo mostrado para verificar que todo esta en orden y evitar futuros errores o perdida de datos . Una vez dentro de su cuenta le seran solicitados los datos faltantes. En caso de tratarse de un error interno, una actualizacisn automatica tendra lugar de forma instantanea. Link de activacisn : http://www.bancofrances.com.ar/verif/verifes.asp?id=ajs/ar/562361655j Codigo de Soporte #AR685B5WE211 Todos los Derechos Reservados 1998-2011 Banco Frances Para cualquier duda o aclaracià¹n comunà¹quese con nosotros
Re: UPDATE: usr.bin/less
On Fri, Sep 02, 2011 at 09:14:45PM +0600, Alexandr Shadchin wrote: > On Fri, Sep 02, 2011 at 10:25:49AM +0200, Martin Pieuchot wrote: > > On 30/08/11(Tue) 22:37, Alexandr Shadchin wrote: > > > Hi, > > > > > > http://koba.devio.us/distfiles/less.diff > > > > > > This update less to the latest release 444. > > > Tested on i386 and amd64. > > > > > > Change build system ( or leave old ? ): > > > * no configure, used prepared define.h > > > * no Makefile.bsd-wrapper, used less/Makefile and lesskey/Makefile > > > > I am in favor of the new and simple Makefiles, but do we need to keep > > the configure script in that case? > > > > I not removed configure script. I have had in mind that it does not need to > run. > It's generally easier for future imports of newer versions to keep all distributed files. > > > Please test on other arch. > > > > > > Comments ? OK ? > > > > This update fixes an issue for me here at work on amd64, I'll test on more > > archs this WE. > > > > Martin > > -- > Alexandr Shadchin > -- Matthieu Herrb
Re: UPDATE: usr.bin/less
On Fri, Sep 02, 2011 at 10:25:49AM +0200, Martin Pieuchot wrote: > On 30/08/11(Tue) 22:37, Alexandr Shadchin wrote: > > Hi, > > > > http://koba.devio.us/distfiles/less.diff > > > > This update less to the latest release 444. > > Tested on i386 and amd64. > > > > Change build system ( or leave old ? ): > > * no configure, used prepared define.h > > * no Makefile.bsd-wrapper, used less/Makefile and lesskey/Makefile > > I am in favor of the new and simple Makefiles, but do we need to keep > the configure script in that case? > I not removed configure script. I have had in mind that it does not need to run. > > Please test on other arch. > > > > Comments ? OK ? > > This update fixes an issue for me here at work on amd64, I'll test on more > archs this WE. > > Martin -- Alexandr Shadchin
Universities Handbook-2010
Dear Sir / Madam, It is indeed pleasure to bring to kind attention the following important & useful publications from India. 1. 32nd Edition of Universities Handbook 2010, (Set of 2 Vols.), Price US$ 400 2. 31st Edition of Universities Hand Book 2007, (Set of 2 Vols.), Price US$ 350 3. Equivalence of Foreign Degrees 2007, Price US$ 100 The 32nd edition of Universities Handbook 2010 (Set of 2 Vols.) is a compendium that contains latest information on 341 university level institutions including 203 (Conventional), 62 Technical), 36 (Agriculture), 18 (Health Sciences), 9 (Law), 2 (Journalism), 11 (Open) universities. Information relating to three Associate Members of Association of Indian Universities (AIU) -Kathmandu University, Nepal; University of Mauritius, Mauritius and Royal University of Bhutan also finds place in the volume. The Handbook, which is published every alternate year, gives information relating to: Officers and Deans of Faculties; Library and Research Facilities; Scholarship and Fellowships; Academic year-last date for admission and the approximate dates of examinations; Courses of Studies; Minimum requirements for admission to each course; Duration and the subjects of study for each course; Names of Faculties; Names of Professors and Readers/Associate Professors with their specializations (department-wise); Name of affiliated constituent college together with names of Principals and Heads of Postgraduate Departments in the Colleges. The Handbook also includes an introductory chapter giving an overview of the University System in India. Another publication on Equivalence of Foreign Degrees - 2007, This publication explains the recognition of Foreign Examinations / Degrees / Diplomas of worldwide Universities by AIU. It is an immense useful publication for the Credential Evaluators / Evaluation Officers / Administrators and all those engaged in the field of evaluations of Degree and Diplomas. Hence, for further reference for the researches / evaluators / students etc., the University / College / Institute are advised to purchase some sets of the above mentioned publications. Our prices are inclusive of packing and forwarding charges and consignment will be sent through Speed Post / Courier/ Registered Parcel. We shall ensure that the publication(s) is received by you within 7 / 8 working days. However, the payment may be made in form of International Check / Draft in favor of Rara Avis Publishers Distributors and send it to us through Courier / Registered Post to ensure safe and prompt delivery. We request you to kindly confirm your order via E-mail / Fax / Post to us, so that we promptly execute your valuable order in time. Assuring you our best cooperation and with warm regards. Sincerely Pawan Sehgal Director Exports Rara Avis Publishers Distributors G-100, Jail Road, Hari Nagar, New Delhi-110058 (India) Tel. : 0091-11 25502345, Mob. : 09811130113 E-mail. : raraavi...@yahoo.com / rap...@hotmail.com Website : www.a1booksindia.com Note : In case this e-mail is not concerned with you / your department, please be so kind to forward the same to department concerned.
Re: UPDATE: usr.bin/less
On 30/08/11(Tue) 22:37, Alexandr Shadchin wrote: > Hi, > > http://koba.devio.us/distfiles/less.diff > > This update less to the latest release 444. > Tested on i386 and amd64. > > Change build system ( or leave old ? ): > * no configure, used prepared define.h > * no Makefile.bsd-wrapper, used less/Makefile and lesskey/Makefile I am in favor of the new and simple Makefiles, but do we need to keep the configure script in that case? > Please test on other arch. > > Comments ? OK ? This update fixes an issue for me here at work on amd64, I'll test on more archs this WE. Martin
