Changeset 29ff5c2 for protocols/oscar/conn.c

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feat/hip-cat

File:

• protocols/oscar/conn.c (modified) (3 diffs)

protocols/oscar/conn.c

@@ -15 +15 @@
  * In OSCAR, every connection has a set of SNAC groups associated
  * with it.  These are the groups that you can send over this connection
- * without being guarenteed a "Not supported" SNAC error.
+ * without being guaranteed a "Not supported" SNAC error.
  *
  * The grand theory of things says that these associations transcend
@@ -36 +36 @@
  *
  * Here comes the good bit.  Without even letting anyone know, particularly
- * the module that decided to send this SNAC, and definitly not that twit
+ * the module that decided to send this SNAC, and definitely not that twit
  * in Greenland, you send out a service request.  In this request, you have
  * marked the need for a connection supporting group 0x000e.  A few seconds
@@ -317 +317 @@
 
         if (deadconn->fd >= 3) {
-                closesocket(deadconn->fd);
+                proxy_disconnect(deadconn->fd);
         }
         deadconn->fd = -1;