Re: [Nagios-devel] NRPE SSL_shutdown patch

Support forum for Nagios Core, Nagios Plugins, NCPA, NRPE, NSCA, NDOUtils and more. Engage with the community of users including those using the open source solutions.
Locked
Guest

Re: [Nagios-devel] NRPE SSL_shutdown patch

Post by Guest »

--f46d042c6b97e8631e04bc60a9e1
Content-Type: text/plain; charset=ISO-8859-1

On Thu, Mar 29, 2012 at 12:19 PM, Andreas Ericsson wrote:
> * Write a wrapper to shutdown the connection so you don't have to
> duplicate the code everywhere. close_connection() would be a good
> name for it, and it should handle the #ifdef HAVE_SSL stuff as well
> so it can be removed from (most) of the application logic.
>
> * Add a short sleep-timer between calls, or poll() the underlying
> socket for inbound data so the other node has time to send a
> response. I imagine your patch will work horribly on links from
> Europe to China, for instance, because latency will be too high.

Agree with regards to both issues. The code is not in my style, was
trying to keep it similar to project's.

The attached patch hopefully fixes the duplicate code to your
satisfaction. If I have some time I'll look at addressing the time-out
issue later (interestingly, a few other major projects don't take this
into account either).

- Jari

--f46d042c6b97e8631e04bc60a9e1
Content-Type: text/x-patch; charset=US-ASCII; name="nrpe-ssl_shutdown-3.patch"
Content-Disposition: attachment; filename="nrpe-ssl_shutdown-3.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_h0drlv7h0

ZGlmZiAtcnVOIG5ycGUtMi4xMy5vcmlnL2luY2x1ZGUvbnJwZS5oIG5ycGUtMi4xMy9pbmNsdWRl
L25ycGUuaAotLS0gbnJwZS0yLjEzLm9yaWcvaW5jbHVkZS9ucnBlLmgJMjAxMS0xMS0wNCAxODo1
Nzo0MS4wMDAwMDAwMDAgKzAwMDAKKysrIG5ycGUtMi4xMy9pbmNsdWRlL25ycGUuaAkyMDEyLTAz
LTI5IDEzOjA2OjExLjAwNDA3NDA4NiArMDEwMApAQCAtMzgsNiArMzgsOSBAQAogDQogaW50IHBy
b2Nlc3NfYXJndW1lbnRzKGludCxjaGFyICoqKTsNCiB2b2lkIHdhaXRfZm9yX2Nvbm5lY3Rpb25z
KHZvaWQpOw0KKyNpZmRlZiBIQVZFX1NTTA0KK3ZvaWQgY2xvc2VfY29ubmVjdGlvbihTU0wgKik7
DQorI2VuZGlmDQogdm9pZCBoYW5kbGVfY29ubmVjdGlvbihpbnQpOw0KIGludCByZWFkX2NvbmZp
Z19maWxlKGNoYXIgKik7DQogaW50IHJlYWRfY29uZmlnX2RpcihjaGFyICopOw0KZGlmZiAtcnVO
IG5ycGUtMi4xMy5vcmlnL3NyYy9jaGVja19ucnBlLmMgbnJwZS0yLjEzL3NyYy9jaGVja19ucnBl
LmMKLS0tIG5ycGUtMi4xMy5vcmlnL3NyYy9jaGVja19ucnBlLmMJMjAxMS0xMS0xMSAxODo0NTo0
OS4wMDAwMDAwMDAgKzAwMDAKKysrIG5ycGUtMi4xMy9zcmMvY2hlY2tfbnJwZS5jCTIwMTItMDMt
MjkgMTI6NTQ6MjUuNDEzODQ4OTkxICswMTAwCkBAIC01OSw2ICs1OSw5IEBACiAgICAgICAgIHVf
aW50MzJfdCBjYWxjdWxhdGVkX2NyYzMyOw0KIAlpbnQxNl90IHJlc3VsdDsNCiAJaW50IHJjOw0K
KyNpZmRlZiBIQVZFX1NTTA0KKwlpbnQgeDsNCisjZW5kaWYNCiAJcGFja2V0IHNlbmRfcGFja2V0
Ow0KIAlwYWNrZXQgcmVjZWl2ZV9wYWNrZXQ7DQogCWludCBieXRlc190b19zZW5kOw0KQEAgLTIz
Niw3ICsyMzksOSBAQAogCQkvKiBjbG9zZSB0aGUgY29ubmVjdGlvbiAqLw0KICNpZmRlZiBIQVZF
X1NTTA0KIAkJaWYodXNlX3NzbD09VFJVRSl7DQotCQkJU1NMX3NodXRkb3duKHNzbCk7DQorCQkJ
Zm9yKHg9MDt4PDQ7eCsrKQ0KKwkJCQlpZihTU0xfc2h1dGRvd24oc3NsKSkNCisJCQkJCWJyZWFr
Ow0KIAkJCVNTTF9mcmVlKHNzbCk7DQogCQkJU1NMX0NUWF9mcmVlKGN0eCk7DQogCSAgICAgICAg
ICAgICAgICB9DQpkaWZmIC1ydU4gbnJwZS0yLjEzLm9yaWcvc3JjL25ycGUuYyBucnBlLTIuMTMv
c3JjL25ycGUuYwotLS0gbnJwZS0yLjEzLm9yaWcvc3JjL25ycGUuYwkyMDExLTExLTExIDE4OjQ1
OjQ5LjAwMDAwMDAwMCArMDAwMAorKysgbnJwZS0yLjEzL3NyYy9ucnBlLmMJMjAxMi0wMy0yOSAx
Mjo1NDoyNS40MTQ4NDg5OTQgKzAxMDAKQEAgLTk1OCw2ICs5NTgsMTUgQEAKIAlyZXR1cm47DQog
CX0NCiANCisjaWZkZWYgSEFWRV9TU0wNCit2b2lkIGNsb3NlX2Nvbm5lY3Rpb24oU1NMICpzc2wp
ew0KKwlpbnQgeDsNCisNCisJZm9yKHg9MDt4PDQ7eCsrKQ0KKwkJaWYoU1NMX3NodXRkb3duKHNz
bCkpDQorCQkJcmV0dXJuOw0KKwl9DQorI2VuZGlmDQogDQogLyogaGFuZGxlcyBhIGNsaWVudCBj
b25uZWN0aW9uICovDQogdm9pZCBoYW5kbGVfY29ubmVjdGlvbihpbnQgc29jayl7DQpAQCAtMTA0
Myw3ICsxMDUyLDcgQEAKIA0KICNpZmRlZiBIQVZFX1NTTA0KIAkJaWYoc3NsKXsNCi0JCQlTU0xf
c2h1dGRvd24oc3NsKTsNCisJCQljbG9zZV9jb25uZWN0aW9uKHNzbCk7DQogCQkJU1NMX2ZyZWUo
c3NsKTsNCiAJCQlzeXNsb2coTE9HX0lORk8sIklORk86IFNTTCBTb2NrZXQgU2h1dGRvd24uXG4i
KTsNCiAJCQl9DQpAQCAtMTA2MCw3ICsxMDY5LDcgQEAKIA0KICNpZmRlZiBIQVZFX1NTTA0KIAkJ
aWYoc3NsKXsNCi0JCQlTU0xfc2h1dGRvd24oc3NsKTsNCisJCQljbG9zZV9jb25uZWN0aW9uKHNz
bCk7DQogCQkJU1NMX2ZyZWUoc3NsKTsNCiAJCQl9DQogI2VuZGlmDQpAQCAtMTA5Miw3ICsxMTAx
LDcgQEAKIA0KICNpZmRlZiBIQVZFX1NTTA0KIAkJaWYoc3NsKXsNCi0JCQlTU0xfc2h1dGRvd24o
c3NsKTsNCisJCQljbG9zZV9jb25uZWN0aW9uKHNzbCk7DQogCQkJU1NMX2ZyZWUoc3NsKTsNCiAJ
CQl9DQogI2VuZGlmDQpAQCAtMTIyMSw3ICsxMjMwLDcgQEAKIA0KICNpZmRlZiBIQVZFX1NTTA0K
IAlpZihzc2wpew0KLQkJU1NMX3NodXRkb3duKHNzbCk7DQorCQljbG9

...[email truncated]...


This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]
Locked