@@ -194,10 +194,10 @@ def grab_channels
194
194
print_good ( "#{ peer } -- camera channels:" )
195
195
data . each_with_index do |val , index |
196
196
number = index . to_s
197
- channels = val [ /([[:print:]]+)/ ] . to_s
198
- channels_table << [ number , channels ]
199
- channels_table . print
197
+ channels = val [ /([[:print:]]+)/ ]
198
+ channels_table << [ "#{ number } " , "#{ channels } " ]
200
199
end
200
+ channels_table . print
201
201
end
202
202
203
203
def grab_users
@@ -216,8 +216,12 @@ def grab_users
216
216
usercount += 1
217
217
user , md5hash , rights , name = val . match ( /^.*:(.*):(.*):.*:(.*):(.*):.*$/ ) . captures
218
218
users_table << [ user , md5hash , rights , name ]
219
- users_table . print
220
- # print_status(" #{val[/(([\d]+)[:]([[:print:]]+))/]}")
219
+ # puts user.class
220
+ # puts md5hash.class
221
+ # puts rights.class
222
+ # puts name.class
223
+ # users_table.print
224
+ print_status ( " #{ val [ /(([\d ]+)[:]([[:print:]]+))/ ] } " )
221
225
# Write the dahua hash to the database
222
226
hash = "#{ rhost } #{ user } :$dahua$#{ md5hash } "
223
227
report_hash ( rhost , rport , user , hash )
@@ -245,12 +249,14 @@ def grab_groups
245
249
'Columns' => [ 'Number' , 'Group' ]
246
250
)
247
251
print_good ( "#{ peer } -- groups:" )
248
- data . each { |val |
249
- number = val [ /(([\d ]+))/ ] . to_i
250
- groups = val [ /(([a-z]+))/ ] . to_i
252
+ data . each do |val |
253
+ number = "#{ val [ /(([\d ]+))/ ] } "
254
+ groups = "#{ val [ /(([a-z]+))/ ] } "
255
+ # puts number.class
256
+ # puts groups.class
251
257
groups_table << [ number , groups ]
252
258
groups_table . print
253
- }
259
+ end
254
260
end
255
261
256
262
def reset_user
0 commit comments