From 4daf5c126a48d2205733610a05037bb5f0350b9b Mon Sep 17 00:00:00 2001 From: Denver Gingerich Date: Wed, 22 Feb 2017 22:16:51 +0000 Subject: [PATCH] bail instead of crash on Gajim's bad sid --- sgx-catapult.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sgx-catapult.rb b/sgx-catapult.rb index 4bd3323cd38c41c4de72179219a356546534f016..b30d36ace7124a36217a163a0fbe43d6cccf592f 100755 --- a/sgx-catapult.rb +++ b/sgx-catapult.rb @@ -33,7 +33,7 @@ require 'log4r' $stdout.sync = true -puts "Soprani.ca/SMS Gateway for XMPP - Catapult v0.028\n\n" +puts "Soprani.ca/SMS Gateway for XMPP - Catapult v0.029\n\n" if ARGV.size != 9 then puts "Usage: sgx-catapult.rb " + @@ -421,6 +421,15 @@ module SGXcatapult user_id, api_token, api_secret, users_num = conn.read conn.disconnect + # Gajim bug: has Jingle (not transport) sid; fix later + if not @jingle_fnames.key? cn[0]['sid'] + puts 'ERROR: Not found in filename map: ' + cn[0]['sid'] + + next + # TODO: in case only Gajim's bug fixed, add map: + #cn[0]['sid'] = @jingle_tsids[cn[0]['sid']] + end + # upload cached data to server (before success reply) media_name = Time.now.utc.iso8601 + '_' + @uuid_gen.generate + '_' + @jingle_fnames[cn[0]['sid']]