It's impossible to separate the two. The terrorist attack just adds urgency to what he has to say.
I think Trump has two? venues tomorrow. He can do both in my opinion. Cover one with the national security issue and the other venue with the Clinton corruption over the years.