[BACK]Return to utils.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/utils.c between versions 1.4 and 1.4.4.2

version 1.4, 2012/07/03 12:46:01 version 1.4.4.2, 2013/07/16 14:34:58
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 54  srv_Socket(cfg_root_t * __restrict cfg) Line 54  srv_Socket(cfg_root_t * __restrict cfg)
         int s = -1;          int s = -1;
         ait_val_t v;          ait_val_t v;
         u_short port;          u_short port;
        io_sockaddr_t sa = {{ 0 }};        sockaddr_t sa = {{ 0 }};
   
        ioTRACE(2);        ETRACE();
   
         assert(cfg);          assert(cfg);
   
Line 64  srv_Socket(cfg_root_t * __restrict cfg) Line 64  srv_Socket(cfg_root_t * __restrict cfg)
         port = strtol(AIT_GET_STR(&v), NULL, 0);          port = strtol(AIT_GET_STR(&v), NULL, 0);
         AIT_FREE_VAL(&v);          AIT_FREE_VAL(&v);
         cfg_loadAttribute(cfg, "mqttd", "listen", &v, MQTT_HOST);          cfg_loadAttribute(cfg, "mqttd", "listen", &v, MQTT_HOST);
        if (!io_gethostbyname(AIT_GET_STR(&v), port, &sa)) {        if (!e_gethostbyname(AIT_GET_STR(&v), port, &sa)) {
                ioLIBERR(io);                ELIBERR(elwix);
                 AIT_FREE_VAL(&v);                  AIT_FREE_VAL(&v);
                 return -1;                  return -1;
         } else          } else
Line 73  srv_Socket(cfg_root_t * __restrict cfg) Line 73  srv_Socket(cfg_root_t * __restrict cfg)
   
         s = mqtt_srv_Create(&sa.sa, sa.sa.sa_len);          s = mqtt_srv_Create(&sa.sa, sa.sa.sa_len);
         if (s == -1) {          if (s == -1) {
                ioLIBERR(mqtt);                ELIBERR(mqtt);
                 return -1;                  return -1;
         }          }
   
        ioDEBUG(7, "Created socket=%d\n", s);        EVERBOSE(7, "Created socket=%d\n", s);
         return s;          return s;
 }  }
   
 inline int  inline int
 srv_Close(int s)  srv_Close(int s)
 {  {
        ioTRACE(2);        ETRACE();
   
        ioDEBUG(7, "Closing socket=%d\n", s);        EVERBOSE(7, "Closing socket=%d\n", s);
         return mqtt_srv_Destroy(s);          return mqtt_srv_Destroy(s);
 }  }
Removed from v.1.4  
changed lines
  Added in v.1.4.4.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>