Merge remote-tracking branch 'origin'

JiapengLi · Mar 19, 2018 · d58a108 · d58a108
2 parents c2cbac6 + 24951ba
commit d58a108
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,4 @@ json
 *.bak
 bak
 *.sublime-workspace
+*.orig
diff --git a/lw/lw.c b/lw/lw.c
@@ -714,9 +714,10 @@ int lw_auto_add(lw_frame_t *frame, uint8_t *msg, int len)
     int ret, id;
     uint32_t cnt;
 
-    memset(&endnode.appeui, 0, sizeof(endnode));
+    memset(&endnode, 0, sizeof(endnode));
 
     memcpy(plmic.buf, msg+len-4, 4);
+
     switch(frame->mhdr.bits.mtype){
     case LW_MTYPE_JOIN_REQUEST:
         lw_key.aeskey = lw_dft_appkey;