Remove checkpoint tracing.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index ee73e6b..1c6df40 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -13,9 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -38,20 +38,14 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_id(connection_t *c)
-{
-       cp();
-
+bool send_id(connection_t *c) {
        return send_request(c, "%d %s %d", ID, myself->connection->name,
                                                myself->connection->protocol_version);
 }
 
-bool id_h(connection_t *c)
-{
+bool id_h(connection_t *c) {
        char name[MAX_STRING_SIZE];
 
-       cp();
-
        if(sscanf(c->buffer, "%*d " MAX_STRING " %d", name, &c->protocol_version) != 2) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ID", c->name,
                           c->hostname);
@@ -114,14 +108,11 @@ bool id_h(connection_t *c)
        return send_metakey(c);
 }
 
-bool send_metakey(connection_t *c)
-{
+bool send_metakey(connection_t *c) {
        char *buffer;
        int len;
        bool x;
 
-       cp();
-
        len = RSA_size(c->rsa_key);
 
        /* Allocate buffers for the meta key */
@@ -132,7 +123,7 @@ bool send_metakey(connection_t *c)
 
        if(!c->outctx)
                c->outctx = xmalloc_and_zero(sizeof(*c->outctx));
-       cp();
+
        /* Copy random data to the buffer */
 
        RAND_pseudo_bytes((unsigned char *)c->outkey, len);
@@ -199,14 +190,11 @@ bool send_metakey(connection_t *c)
        return x;
 }
 
-bool metakey_h(connection_t *c)
-{
+bool metakey_h(connection_t *c) {
        char buffer[MAX_STRING_SIZE];
        int cipher, digest, maclength, compression;
        int len;
 
-       cp();
-
        if(sscanf(c->buffer, "%*d %d %d %d %d " MAX_STRING, &cipher, &digest, &maclength, &compression, buffer) != 5) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name,
                           c->hostname);
@@ -298,13 +286,10 @@ bool metakey_h(connection_t *c)
        return send_challenge(c);
 }
 
-bool send_challenge(connection_t *c)
-{
+bool send_challenge(connection_t *c) {
        char *buffer;
        int len;
 
-       cp();
-
        /* CHECKME: what is most reasonable value for len? */
 
        len = RSA_size(c->rsa_key);
@@ -329,13 +314,10 @@ bool send_challenge(connection_t *c)
        return send_request(c, "%d %s", CHALLENGE, buffer);
 }
 
-bool challenge_h(connection_t *c)
-{
+bool challenge_h(connection_t *c) {
        char buffer[MAX_STRING_SIZE];
        int len;
 
-       cp();
-
        if(sscanf(c->buffer, "%*d " MAX_STRING, buffer) != 1) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "CHALLENGE", c->name,
                           c->hostname);
@@ -367,13 +349,10 @@ bool challenge_h(connection_t *c)
        return send_chal_reply(c);
 }
 
-bool send_chal_reply(connection_t *c)
-{
+bool send_chal_reply(connection_t *c) {
        char hash[EVP_MAX_MD_SIZE * 2 + 1];
        EVP_MD_CTX ctx;
 
-       cp();
-
        /* Calculate the hash from the challenge we received */
 
        if(!EVP_DigestInit(&ctx, c->indigest)
@@ -394,14 +373,11 @@ bool send_chal_reply(connection_t *c)
        return send_request(c, "%d %s", CHAL_REPLY, hash);
 }
 
-bool chal_reply_h(connection_t *c)
-{
+bool chal_reply_h(connection_t *c) {
        char hishash[MAX_STRING_SIZE];
        char myhash[EVP_MAX_MD_SIZE];
        EVP_MD_CTX ctx;
 
-       cp();
-
        if(sscanf(c->buffer, "%*d " MAX_STRING, hishash) != 1) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "CHAL_REPLY", c->name,
                           c->hostname);
@@ -454,16 +430,13 @@ bool chal_reply_h(connection_t *c)
        return send_ack(c);
 }
 
-bool send_ack(connection_t *c)
-{
+bool send_ack(connection_t *c) {
        /* ACK message contains rest of the information the other end needs
           to create node_t and edge_t structures. */
 
        struct timeval now;
        bool choice;
 
-       cp();
-
        /* Estimate weight */
 
        gettimeofday(&now, NULL);
@@ -485,8 +458,7 @@ bool send_ack(connection_t *c)
        return send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
 }
 
-static void send_everything(connection_t *c)
-{
+static void send_everything(connection_t *c) {
        avl_node_t *node, *node2;
        node_t *n;
        subnet_t *s;
@@ -518,16 +490,13 @@ static void send_everything(connection_t *c)
        }
 }
 
-bool ack_h(connection_t *c)
-{
+bool ack_h(connection_t *c) {
        char hisport[MAX_STRING_SIZE];
        char *hisaddress, *dummy;
        int weight, mtu;
        long int options;
        node_t *n;
 
-       cp();
-
        if(sscanf(c->buffer, "%*d " MAX_STRING " %d %lx", hisport, &weight, &options) != 3) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name,
                           c->hostname);
@@ -582,7 +551,6 @@ bool ack_h(connection_t *c)
        /* Create an edge_t for this connection */
 
        c->edge = new_edge();
-       cp();
        c->edge->from = myself;
        c->edge->to = n;
        sockaddr2str(&c->address, &hisaddress, &dummy);